Source: swi-prolog Severity: normal Tags: patch Dear Maintainer,
The arch dir for openjdk has changed from ppc64le to ppc64 on ppc64el architecture. https://packages.qa.debian.org/o/openjdk-7/news/20140707T173510Z.html So, once again, I have modified the patch so it will fix the ftbfs. The patch is attached and the build log can be seen at: https://buildd.debian.org/status/fetch.php?pkg=swi-prolog&arch=ppc64el&ver=6.6.6-2&stamp=1409662735 Thanks and regards. Fernando -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: ppc64el (ppc64le) Kernel: Linux 3.16-trunk-powerpc64le (SMP w/32 CPU cores) Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) Shell: /bin/sh linked to /bin/dash
diff -Nru swi-prolog-6.6.6/debian/changelog swi-prolog-6.6.6/debian/changelog --- swi-prolog-6.6.6/debian/changelog 2014-07-14 21:34:19.000000000 +0000 +++ swi-prolog-6.6.6/debian/changelog 2014-09-11 19:02:30.000000000 +0000 @@ -1,3 +1,9 @@ +swi-prolog (6.6.6-2pp64el1) UNRELEASED; urgency=medium + + * The arch dir for openjdk has changed for ppc64el: from ppc64le to ppc64. + + -- Fernando Seiti Furusato <[email protected]> Thu, 11 Sep 2014 19:01:20 +0000 + swi-prolog (6.6.6-2) unstable; urgency=medium * Fix building on ppc64el, thanks to Fernando Seiti Furusato for the patch diff -Nru swi-prolog-6.6.6/debian/patches/java-fixes.diff swi-prolog-6.6.6/debian/patches/java-fixes.diff --- swi-prolog-6.6.6/debian/patches/java-fixes.diff 2014-07-14 21:34:19.000000000 +0000 +++ swi-prolog-6.6.6/debian/patches/java-fixes.diff 2014-09-11 19:01:12.000000000 +0000 @@ -1,17 +1,15 @@ ---- a/packages/jpl/ac/ac_jni_include_dirs.m4 -+++ b/packages/jpl/ac/ac_jni_include_dirs.m4 -@@ -93,6 +93,14 @@ - _JNI_LIBDIRS="" - esac +Index: swi-prolog-6.6.6/packages/jpl/ac/ac_jni_include_dirs.m4 +=================================================================== +--- swi-prolog-6.6.6.orig/packages/jpl/ac/ac_jni_include_dirs.m4 ++++ swi-prolog-6.6.6/packages/jpl/ac/ac_jni_include_dirs.m4 +@@ -83,6 +83,10 @@ mingw32*) JNI_CLIENT_DIRS="$_JTOPD + _JNI_LIBDIRS="lib/amd64" + _JNI_LIBSUBDIRS="server" ;; -+ powerpc64) -+ _JNI_LIBDIRS="lib/ppc64" -+ _JNI_LIBSUBDIRS="server" -+ ;; -+ powerpc64le) -+ _JNI_LIBDIRS="lib/ppc64le" -+ _JNI_LIBSUBDIRS="server" -+ ;; - *) - # Fallback option should work on all architectures except - # amd64 and powerpc which are special cased above. ++ powerpc64 | powerpc64le) ++ _JNI_LIBDIRS="lib/ppc64" ++ _JNI_LIBSUBDIRS="server" ++ ;; + powerpc) + case "$host_os" in + linux*) diff -Nru swi-prolog-6.6.6/debian/patches/series swi-prolog-6.6.6/debian/patches/series --- swi-prolog-6.6.6/debian/patches/series 2014-07-14 21:34:19.000000000 +0000 +++ swi-prolog-6.6.6/debian/patches/series 2014-09-11 18:58:35.000000000 +0000 @@ -1,3 +1,4 @@ +java-fixes.diff maildrop-fpic.diff ignore-format-string-error.diff pkg-config.diff @@ -5,4 +6,3 @@ no-rpath.diff add-pthread.diff override-PLLIBDIR.diff -java-fixes.diff
