commit 6008b4b3cd923de44dafe266c875c2fd6525cbbe
Author: Jakub Bogusz <[email protected]>
Date:   Thu Mar 10 21:17:53 2016 +0100

    - added jni patch (fixes jni libdir detection in openjdk8/x86 case)

 pl-jni.patch | 11 +++++++++++
 pl.spec      |  2 ++
 2 files changed, 13 insertions(+)
---
diff --git a/pl.spec b/pl.spec
index d422238..cbd394b 100644
--- a/pl.spec
+++ b/pl.spec
@@ -29,6 +29,7 @@ Source0:      
http://www.swi-prolog.org/download/stable/src/swi%{name}-%{version}.tar
 Patch0:                %{name}-clib-configure.patch
 Patch1:                %{name}-xpce-install.patch
 Patch2:                %{name}-format.patch
+Patch3:                %{name}-jni.patch
 URL:           http://www.swi-prolog.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -152,6 +153,7 @@ Prolog.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %{__mv} src/Tests/core/test_d_break.pl{,disabled}
 
diff --git a/pl-jni.patch b/pl-jni.patch
new file mode 100644
index 0000000..ed74302
--- /dev/null
+++ b/pl-jni.patch
@@ -0,0 +1,11 @@
+--- swipl-7.2.3/packages/jpl/ac/ac_jni_include_dirs.m4.orig    2015-06-18 
13:26:49.000000000 +0200
++++ swipl-7.2.3/packages/jpl/ac/ac_jni_include_dirs.m4 2016-03-10 
20:50:26.685681495 +0100
+@@ -77,7 +77,7 @@
+ *)  case "$host_cpu" in
+       i?86)
+               _JNI_LIBDIRS="lib/i386"
+-              _JNI_LIBSUBDIRS="client"
++              _JNI_LIBSUBDIRS="client server"
+               ;;
+       x86_64)
+               _JNI_LIBDIRS="lib/amd64"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pl.git/commitdiff/6008b4b3cd923de44dafe266c875c2fd6525cbbe

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to