[pkg-db-commits] [SCM] UNNAMED PROJECT branch, debian-sid, updated. debian/5.1.25-6-5-ga0c2889

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 8f13e88cf42ae36d0325158f26e07c7d9b6ef179
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Apr 21 14:57:30 2011 +0200

    Disable Java build on mips

diff --git a/debian/rules b/debian/rules
index 284fe87..570a7fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@ DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
+JAVA_BROKEN_ARCHS = mips
 GCJ_BROKEN_ARCHS = ia64 sparc mips
 
 -include /usr/share/gcj/debian_defaults
@@ -40,7 +41,6 @@ CONFIGURE_SWITCHES =    --prefix=/usr \
 			--enable-sql \
 			--enable-stl \
 			--enable-tcl \
-			--enable-java \
 			--with-tcl=/usr/lib \
 			--enable-test
 
@@ -54,10 +54,19 @@ endif
 JAVA_HOME ?= /usr/lib/jvm/default-java
 CFLAGS += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 
+ifeq (,$(filter $(DEB_BUILD_ARCH), $(JAVA_BROKEN_ARCHS)))
+#enable java
+CONFIGURE_SWITCHES += --enable-java
+DH_PLUGINS += --with=javahelper
 # don't build java-gcj package on non-native or broken archs
 ifeq (,$(filter $(DEB_BUILD_ARCH), $(GCJ_NATIVE_ARCHS)))
 DH_OPTIONS += -Nlibdb5.1-java-gcj
 endif
+else
+#disable java
+CONFIGURE_SWITCHES += --disable-java
+DH_OPTIONS += -Nlibdb5.1-java -Nlibdb5.1-java-dev -Nlibdb5.1-java-gcj
+endif
 
 BROKEN_CPUS = zs390z
 VERY_BROKEN_CPUS = zm68kz zhppaz
@@ -73,7 +82,7 @@ version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
 version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 
 %:
-	dh $@ --with=javahelper
+	dh $@ $(DH_PLUGINS)
 
 override_dh_auto_configure:
 	dh_auto_configure -Ddist -Bbuild -- $(CONFIGURE_SWITCHES)
@@ -134,7 +143,9 @@ override_dh_clean:
 	DH_OPTIONS="" dh_clean
 
 override_jh_installlibs:
+ifeq (,$(filter $(DEB_BUILD_ARCH), $(JAVA_BROKEN_ARCHS)))
 	jh_installlibs
 ifneq (,$(filter $(DEB_BUILD_ARCH), $(GCJ_NATIVE_ARCHS)))
 	dh_nativejava
 endif
+endif

-- 
UNNAMED PROJECT