r47205 - in /packages/jhdf/trunk/debian: changelog rules

[pini at users.alioth.debian.org]

Author: pini
Date: Tue Mar 22 21:36:06 2016
New Revision: 47205

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47205
Log:
Workaround #760301 (fix FTBFS on several archs)

Modified:
    packages/jhdf/trunk/debian/changelog
    packages/jhdf/trunk/debian/rules

Modified: packages/jhdf/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/changelog?rev=47205&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/changelog	(original)
+++ packages/jhdf/trunk/debian/changelog	Tue Mar 22 21:36:06 2016
@@ -1,3 +1,9 @@
+jhdf (2.9-5) unstable; urgency=medium
+
+  * CPPFLAGS+=-I$(JAVA_HOME)/include/linux to workaround #760301.
+
+ -- Gilles Filippini <pini at debian.org>  Tue, 22 Mar 2016 22:32:19 +0100
+
 jhdf (2.9-4) unstable; urgency=medium
 
   [ Andreas Tille ]

Modified: packages/jhdf/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/jhdf/trunk/debian/rules?rev=47205&op=diff
==============================================================================
--- packages/jhdf/trunk/debian/rules	(original)
+++ packages/jhdf/trunk/debian/rules	Tue Mar 22 21:36:06 2016
@@ -14,10 +14,14 @@
   WITH_HDF5:=--with-hdf5=/usr/include,/usr/lib/$(DEB_HOST_MULTIARCH)
 endif
 
+JAVA_HOME := /usr/lib/jvm/default-java
+
+# Workaround #760301
+export CPPFLAGS+="-I$(JAVA_HOME)/include/linux"
 
 DEB_CONFIGURE_EXTRA_FLAGS := CC=gcc
 
-DEB_CONFIGURE_NORMAL_ARGS += --with-jdk=/usr/lib/jvm/default-java/include/,/usr/lib/jvm/default-java/lib/ --with-classpath=/usr/lib/jvm/default-java/lib/ --with-javabin=/usr/lib/jvm/default-java/bin/  --with-libz=yes,/usr/lib --with-libsz=yes,/usr/lib --with-libjpeg=yes,/usr/lib/   $(WITH_HDF5) --with-hdf4=/usr/include/hdf/,/usr/lib/
+DEB_CONFIGURE_NORMAL_ARGS += --with-jdk=$(JAVA_HOME)/include/,$(JAVA_HOME)/lib/ --with-classpath=$(JAVA_HOME)/lib/ --with-javabin=$(JAVA_HOME)/bin/  --with-libz=yes,/usr/lib --with-libsz=yes,/usr/lib --with-libjpeg=yes,/usr/lib/   $(WITH_HDF5) --with-hdf4=/usr/include/hdf/,/usr/lib/
 DEB_CONFIGURE_PREFIX := $(CURDIR)/debian/tmp/
 
 get-orig-source: