package: jemboss
version: 6.0.1-6
severity: serious
tags: patch

In -7 openjdk-6-jdk was moved from build-depends-indep to the build-depends. This makes it impossible to build the architecture dependent packages on hppa and hence prevents emboss from migrating to testing.

The following patch (based on -6 as -7 hadn't hit the mirrors yet plus it'll probablly be a smaller diff ;) ) allows the architecture specific binaries (which afaict have nothing to do with java) to be built without needing openjdk-6-jdk installed. It also fixes a FTBFS if built twice in a row issue I ran into while working on the patch.


diff -ur emboss-6.0.1/debian/rules emboss-6.0.1.new/debian/rules
--- emboss-6.0.1/debian/rules	2009-03-31 04:10:30.000000000 +0100
+++ emboss-6.0.1.new/debian/rules	2009-03-31 02:51:13.000000000 +0100
@@ -11,15 +11,21 @@
 AJAX        = $(CURDIR)/debian/libajax6
 NUCLEUS     = $(CURDIR)/debian/libnucleus6
 
+CONFFLAGS   = --prefix=/usr --bindir=/usr/lib/emboss
+
+#if openjdk-6-jdk is not installed don't tell configure to use it
+#this allows binary-arch builds to be performed without openjdk 
+#installed
+ifneq ($(wildcard /usr/lib/jvm/java-6-openjdk/include/classfile_constants.h),)
+    CONFFLAGS +=  --with-java=/usr/lib/jvm/java-6-openjdk/include
+    CONFFLAGS += --with-javaos=/usr/lib/jvm/java-6-openjdk/include/linux
+endif
+
 config.status:
 	dh_testdir
 	ln -sf /usr/share/misc/config.sub .
 	ln -sf /usr/share/misc/config.guess .
-	./configure                                                     \
-		--prefix=/usr                                           \
-		--bindir=/usr/lib/emboss                                \
-		--with-java=/usr/lib/jvm/java-6-openjdk/include         \
-		--with-javaos=/usr/lib/jvm/java-6-openjdk/include/linux
+	./configure $(CONFFLAGS)
 
 include /usr/share/quilt/quilt.make
 
@@ -47,7 +53,7 @@
 
 	find jemboss/ -type f -name "*.class" | xargs -r rm -f
 
-	$(RM) debian/emboss_tmp
+	rm -rf debian/emboss_tmp
 
 	$(RM) config.status install-stamp
 	

Reply via email to