[jpy] 02/09: * debian/patches/ppc64el.patch: fixing ppc64el arch dir to fix FTBFS. OpenJDK is currently using notation 'ppc64le'.

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Oct 28 11:20:11 UTC 2016


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag debian/0.8-6
in repository jpy.

commit c16632392bfa8eb480c2809e9ef3da5403834c50
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Aug 30 05:28:46 2016 +0100

    * debian/patches/ppc64el.patch: fixing ppc64el arch dir to fix FTBFS.
      OpenJDK is currently using notation 'ppc64le'.
---
 debian/changelog             |  8 ++++++++
 debian/patches/ppc64el.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ba1f362..95094c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jpy (0.8-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/ppc64el.patch: fixing ppc64el arch dir to fix FTBFS.
+    OpenJDK is currently using notation 'ppc64le'.
+
+ -- Fernando Seiti Furusato <ferseiti at br.ibm.com>  Mon, 01 Aug 2016 13:48:50 -0400
+
 jpy (0.8-4) unstable; urgency=medium
 
   * Adapt patch to detect more archs correctly
diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch
new file mode 100644
index 0000000..84611ea
--- /dev/null
+++ b/debian/patches/ppc64el.patch
@@ -0,0 +1,26 @@
+Author: Fernando Seiti Furusato <ferseiti at br.ibm.com>
+Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833174
+Description: support for ppc64el  architecture
+Last-Updated: 2016-08-30
+Forwarded: no
+
+--- a/jpyutil.py
++++ b/jpyutil.py
+@@ -161,6 +161,8 @@
+     arch = check_output(['dpkg-architecture','-q', 'DEB_BUILD_ARCH_CPU']).strip()
+     if type(arch) != str: # python3
+         arch = arch.decode('utf-8')
++    if arch == 'ppc64el':
++        arch = 'ppc64le'
+     return (os.path.join(java_home_dir, 'bin'),
+             os.path.join(java_home_dir, 'bin', 'server'),
+             os.path.join(java_home_dir, 'bin', 'client'),
+@@ -200,6 +202,8 @@
+     arch = check_output(['dpkg-architecture','-q', 'DEB_BUILD_ARCH_CPU']).strip()
+     if type(arch) != str: # python3
+         arch = arch.decode('utf-8')
++    if arch == 'ppc64el':
++        arch = 'ppc64le'
+     search_dirs += "/usr/lib/jvm/default-java/jre/lib/%s/server" % arch
+ 
+     search_dirs = _add_paths_if_exists([], *search_dirs)
diff --git a/debian/patches/series b/debian/patches/series
index 05948d0..2079c2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ no-ez_setup.patch
 default_jvm.patch
 python3.patch
 reproducible.patch
+ppc64el.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/jpy.git



More information about the debian-science-commits mailing list