rpms/pl/F-8 pl-5.6.52-fix-java-directory.patch, NONE, 1.1 pl-5.6.52-jni.patch, NONE, 1.1 pl-5.6.55-configure.patch, NONE, 1.1

[Mary Ellen Foster (mef)]

Author: mef

Update of /cvs/pkgs/rpms/pl/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16460

Added Files:
	pl-5.6.52-fix-java-directory.patch pl-5.6.52-jni.patch 
	pl-5.6.55-configure.patch 
Log Message:
Add patches to CVS

pl-5.6.52-fix-java-directory.patch:

--- NEW FILE pl-5.6.52-fix-java-directory.patch ---
--- pl-5.6.52/packages/jpl/configure.orig	2008-03-31 14:49:28.000000000 +0200
+++ pl-5.6.52/packages/jpl/configure	2008-03-31 15:29:02.000000000 +0200
@@ -4629,14 +4629,12 @@
 		_JNI_LIBSUBDIR="server"
 		;;
 	powerpc)
-		case "$host_os" in
-		linux*)
-			_JNI_LIBDIRS="bin"
-			_JNI_LIBSUBDIR="classic"
-			;;
-		*)
-			_JNI_LIBDIRS=""
-		esac
+		_JNI_LIBDIRS="lib/ppc"
+		_JNI_LIBSUBDIR="server"
+		;;
+	powerpc64)
+		_JNI_LIBDIRS="lib/ppc64"
+		_JNI_LIBSUBDIR="server"
 		;;
 	*)
 		_JNI_LIBDIRS=""

pl-5.6.52-jni.patch:

--- NEW FILE pl-5.6.52-jni.patch ---
diff -ur pl-5.6.52/packages/jpl.orig/jpl.pl pl-5.6.52/packages/jpl/jpl.pl
--- pl-5.6.52/packages/jpl.orig/jpl.pl	2008-03-12 20:33:08.000000000 +0100
+++ pl-5.6.52/packages/jpl/jpl.pl	2008-04-08 14:47:59.000000000 +0200
@@ -4390,7 +4390,8 @@
 :- multifile user:file_search_path/2.
 :- dynamic   user:file_search_path/2.
 
-user:file_search_path(jar, swi(lib)).
+user:file_search_path(jar, 'LIBDIR/pl-jpl').
+user:file_search_path(jni, 'LIBDIR/pl-jpl').
 
 %%	add_search_path(+Var, +Value) is det.
 %
@@ -4534,7 +4535,7 @@
 
 libjpl(File) :-
 	(   current_prolog_flag(unix, true)
-	->  File = foreign(libjpl)
+	->  File = jni(libjpl)
 	;   File = foreign(jpl)
 	).
 
diff -ur pl-5.6.52/packages/jpl.orig/src/java/jpl/fli/Prolog.java pl-5.6.52/packages/jpl/src/java/jpl/fli/Prolog.java
--- pl-5.6.52/packages/jpl.orig/src/java/jpl/fli/Prolog.java	2008-03-12 20:33:08.000000000 +0100
+++ pl-5.6.52/packages/jpl/src/java/jpl/fli/Prolog.java	2008-04-08 14:17:08.000000000 +0200
@@ -79,7 +79,7 @@
  */
 public final class Prolog {
 	static {
-		System.loadLibrary("jpl");
+		System.load("LIBDIR/pl-jpl/libjpl.so");
 	}
 
 	/* term types */

pl-5.6.55-configure.patch:

--- NEW FILE pl-5.6.55-configure.patch ---
--- pl-5.6.55/src/configure.orig	2008-05-12 20:57:45.000000000 +0100
+++ pl-5.6.55/src/configure	2008-05-20 15:02:57.000000000 +0100
@@ -9480,7 +9480,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char $ac_func ();
+extern int $ac_func;
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
@@ -9491,7 +9491,7 @@
 int
 main ()
 {
-return $ac_func ();
+return $ac_func;
   ;
   return 0;
 }
@@ -9592,7 +9592,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char $ac_func ();
+extern int $ac_func;
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
@@ -9603,7 +9603,7 @@
 int
 main ()
 {
-return $ac_func ();
+return $ac_func;
   ;
   return 0;
 }