SOURCES: jamvm-libdir.patch - use classpath-specific lib dir - dro...

[qboosh]

Author: qboosh                       Date: Sun Dec  2 23:06:49 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use classpath-specific lib dir
- dropped .so.0 part - more problems than benefit; gij uses .so too

---- Files affected:
SOURCES:
   jamvm-libdir.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/jamvm-libdir.patch
diff -u SOURCES/jamvm-libdir.patch:1.4 SOURCES/jamvm-libdir.patch:1.5
--- SOURCES/jamvm-libdir.patch:1.4	Sat May 27 01:05:02 2006
+++ SOURCES/jamvm-libdir.patch	Mon Dec  3 00:06:44 2007
@@ -6,23 +6,10 @@
  char *getBootDllPath() {
 -    return CLASSPATH_INSTALL_DIR"/lib/classpath";
 +#if defined(__x86_64__) || defined(__arch64__)
-+    return CLASSPATH_INSTALL_DIR"/lib64";
++    return CLASSPATH_INSTALL_DIR"/lib64/classpath";
 +#else
-+    return CLASSPATH_INSTALL_DIR"/lib";
++    return CLASSPATH_INSTALL_DIR"/lib/classpath";
 +#endif
  }
  
  char *getDllName(char *name) {
---- jamvm-1.4.3/src/os/linux/os.c.orig	2005-09-11 01:31:14.000000000 +0200
-+++ jamvm-1.4.3/src/os/linux/os.c	2005-10-22 03:37:20.298303576 +0200
-@@ -38,8 +38,8 @@
- }
- 
- char *nativeLibMapName(char *name) {
--   char *buff = sysMalloc(strlen(name) + sizeof("lib.so") + 1);
-+   char *buff = sysMalloc(strlen(name) + sizeof("lib.so.0") + 1);
- 
--   sprintf(buff, "lib%s.so", name);
-+   sprintf(buff, "lib%s.so.0", name);
-    return buff;
- }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/jamvm-libdir.patch?r1=1.4&r2=1.5&f=u