[pkg-db-commits] [db5.3] 03/03: Don't build java bindings on m68k (Closes: 719842)

[Ondrej Sury]

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

ondrej pushed a commit to branch debian-sid
in repository db5.3.

commit feb28cb4af0efe5b093080b311848cf1eb7dd34d
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jul 4 16:30:03 2014 +0200

    Don't build java bindings on m68k (Closes: 719842)
---
 debian/control | 6 +++---
 debian/rules   | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 743b21e..8775a9b 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ Build-Depends: debhelper (>= 9),
 	       dh-autoreconf,
 	       tcl-dev,
 	       procps [!hurd-i386],
-	       javahelper,
-	       default-jdk,
-	       gcj-native-helper
+	       javahelper [!m68k],
+	       default-jdk [!m68k],
+	       gcj-native-helper [!m68k]
 Homepage: http://www.oracle.com/technology/software/products/berkeley-db/index.html
 Vcs-Browser: http://git.debian.org/?p=pkg-db/db5.3.git
 Vcs-Git: git://git.debian.org/pkg-db/db5.3.git
diff --git a/debian/rules b/debian/rules
index b7b669a..72a4868 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ include /usr/share/dpkg/architecture.mk
 -include /usr/share/gcj/debian_defaults
 -include /usr/share/javahelper/java-vars.mk
 
-JAVA_BROKEN_ARCHS =
+JAVA_BROKEN_ARCHS = m68k
 GCJ_BROKEN_ARCHS = 
 GCJ_NATIVE_ARCHS = $(filter-out $(GCJ_BROKEN_ARCHS), $(gcj_native_archs))
 
@@ -30,6 +30,9 @@ ifeq (,$(filter $(DEB_HOST_ARCH), $(JAVA_BROKEN_ARCHS)))
   ENABLE_JAVA=yes
 ifneq (,$(filter $(DEB_HOST_ARCH), $(GCJ_NATIVE_ARCHS)))
   ENABLE_GCJ=yes
+else
+  # work around bug #719842 in javahelper
+  ENABLE_JAVA=no
 endif
 endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-db/db5.3.git