SOURCES: jamvm-i786.patch, jamvm-javadir.patch, jamvm-libdir.patch...

qboosh qboosh at pld-linux.org
Sat Oct 22 03:47:24 CEST 2005 

Author: qboosh                       Date: Sat Oct 22 01:47:24 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.3.3

---- Files affected:
SOURCES:
   jamvm-i786.patch (1.2 -> 1.3) , jamvm-javadir.patch (1.3 -> 1.4) , jamvm-libdir.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/jamvm-i786.patch
diff -u SOURCES/jamvm-i786.patch:1.2 SOURCES/jamvm-i786.patch:1.3
--- SOURCES/jamvm-i786.patch:1.2	Sun Apr 24 23:13:24 2005
+++ SOURCES/jamvm-i786.patch	Sat Oct 22 03:47:19 2005
@@ -1,11 +1,11 @@
---- jamvm-1.3.0/configure.ac.orig	2005-03-21 01:21:59.000000000 +0100
-+++ jamvm-1.3.0/configure.ac	2005-04-24 23:15:10.884023312 +0200
+--- jamvm-1.3.3/configure.ac.orig	2005-09-13 01:41:06.000000000 +0200
++++ jamvm-1.3.3/configure.ac	2005-10-22 03:44:00.243502664 +0200
 @@ -55,7 +55,7 @@
  AC_CANONICAL_HOST
  
  case "$host" in
 -i[[456]]86-*-linux*) host_cpu=i386 host_os=linux ;;
 +i[[4567]]86-*-linux*) host_cpu=i386 host_os=linux ;;
+ i[[456]]86-*-openbsd*) host_cpu=i386 host_os=linux libdl_needed=no ;;
+ x86_64-*-linux*) host_os=linux ;;
  arm*-*-linux*) host_cpu=arm host_os=linux ;;
- powerpc-*-linux*) host_os=linux ;;
- powerpc-*-darwin*) host_os=darwin ;;

================================================================
Index: SOURCES/jamvm-javadir.patch
diff -u SOURCES/jamvm-javadir.patch:1.3 SOURCES/jamvm-javadir.patch:1.4
--- SOURCES/jamvm-javadir.patch:1.3	Tue Mar  8 01:53:03 2005
+++ SOURCES/jamvm-javadir.patch	Sat Oct 22 03:47:19 2005
@@ -1,22 +1,26 @@
---- jamvm-1.2.3/lib/Makefile.am.orig	2004-12-24 05:27:04.000000000 +0100
-+++ jamvm-1.2.3/lib/Makefile.am	2005-01-05 20:23:39.638728376 +0100
-@@ -1,4 +1,4 @@
--GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/glibj.zip
-+GLIBJ_ZIP = ${with_classpath_install_dir}/share/java/glibj.zip
+--- jamvm-1.3.3/lib/Makefile.am.orig	2005-09-12 02:55:26.000000000 +0200
++++ jamvm-1.3.3/lib/Makefile.am	2005-10-22 03:40:44.970188720 +0200
+@@ -1,5 +1,5 @@
+- at use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/glibj.zip
+- at use_zip_no@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/
++ at use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/java/glibj.zip
++ at use_zip_no@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/java/
  
- SUBDIRS = jamvm java
- EXTRA_DIST = classes.zip README
---- jamvm-1.2.3/lib/Makefile.in.orig	2004-12-24 05:28:00.000000000 +0100
-+++ jamvm-1.2.3/lib/Makefile.in	2005-01-05 20:26:52.666383712 +0100
-@@ -147,7 +147,7 @@
- use_zip_no = @use_zip_no@
- use_zip_yes = @use_zip_yes@
- with_classpath_install_dir = @with_classpath_install_dir@
--GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/glibj.zip
-+GLIBJ_ZIP = ${with_classpath_install_dir}/share/java/glibj.zip
  SUBDIRS = jamvm java gnu
  EXTRA_DIST = classes.zip README
- noinst_DATA = inst_classes.zip
+--- jamvm-1.3.3/lib/Makefile.in.orig	2005-09-13 01:42:39.000000000 +0200
++++ jamvm-1.3.3/lib/Makefile.in	2005-10-22 03:40:57.947215912 +0200
+@@ -347,8 +347,8 @@
+ 	uninstall uninstall-am uninstall-info-am \
+ 	uninstall-info-recursive uninstall-local uninstall-recursive
+ 
+- at use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/glibj.zip
+- at use_zip_no@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/
++ at use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/java/glibj.zip
++ at use_zip_no@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/java/
+ 
+ inst_classes.zip: classes.zip
+ 	ln -fs $< $@
 --- jamvm-1.2.3/src/class.c.orig	2004-12-24 03:02:53.000000000 +0100
 +++ jamvm-1.2.3/src/class.c	2005-01-05 20:27:31.395495992 +0100
 @@ -1254,9 +1254,9 @@

================================================================
Index: SOURCES/jamvm-libdir.patch
diff -u SOURCES/jamvm-libdir.patch:1.2 SOURCES/jamvm-libdir.patch:1.3
--- SOURCES/jamvm-libdir.patch:1.2	Wed Oct 20 21:20:41 2004
+++ SOURCES/jamvm-libdir.patch	Sat Oct 22 03:47:19 2005
@@ -1,24 +1,28 @@
---- jamvm-1.2.0/src/dll.c.orig	2004-08-30 12:41:50.000000000 +0200
-+++ jamvm-1.2.0/src/dll.c	2004-10-20 21:13:02.071328216 +0200
-@@ -256,7 +256,11 @@
+--- jamvm-1.3.3/src/dll.c.orig	2005-09-08 02:50:33.000000000 +0200
++++ jamvm-1.3.3/src/dll.c	2005-10-22 03:34:16.343268992 +0200
+@@ -291,7 +291,11 @@
+ }
  
- char *getDllPath() {
-     char *env = getenv("LD_LIBRARY_PATH");
--    char *cp_path = CLASSPATH_INSTALL_DIR"/lib/classpath";
+ char *getBootDllPath() {
+-    return CLASSPATH_INSTALL_DIR"/lib/classpath";
 +#if defined(__x86_64__) || defined(__arch64__)
-+    char *cp_path = CLASSPATH_INSTALL_DIR"/lib64";
++    return CLASSPATH_INSTALL_DIR"/lib64";
 +#else
-+    char *cp_path = CLASSPATH_INSTALL_DIR"/lib";
++    return CLASSPATH_INSTALL_DIR"/lib";
 +#endif
+ }
  
-     if(env) {
-         char *buff = sysMalloc(strlen(env) + strlen(cp_path) + 2);
-@@ -271,7 +275,7 @@
- char *getDllName(char *path, char *name) {
-    char *buff = sysMalloc(strlen(path) + strlen(name) + 8);
+ char *getDllName(char *name) {
+--- jamvm-1.3.3/src/os/linux/dll_os.c.orig	2005-09-11 01:31:14.000000000 +0200
++++ jamvm-1.3.3/src/os/linux/dll_os.c	2005-10-22 03:37:20.298303576 +0200
+@@ -38,8 +38,8 @@
+ }
  
--   sprintf(buff, "%s/lib%s.so", path, name);
-+   sprintf(buff, "%s/lib%s.so.0", path, name);
+ 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/SOURCES/jamvm-i786.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/jamvm-javadir.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/jamvm-libdir.patch?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list