From eb656be34153321c89aaf9b7b5a7cc0b52d3d0f9 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 17 May 2012 17:20:23 +0200 Subject: [PATCH] rules: Use /usr/share/javahelper/java-arch.sh to determine the Java arch. Thus, we make sure armhf and armel are supported as well; thanks to peter green for reporting this and providing the pointer. Closes: #656274 --- debian/changelog | 4 ++++ debian/rules | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c36ac7d..338defa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,10 @@ collectd (4.10.7-1) unstable; urgency=low providing the patch (Closes: #656271). - Don't force building of the ipvs plugin. The ip_vs.h check has been fixed in configure. + - Use /usr/share/javahelper/java-arch.sh to determine the Java + architecture directory, thus, making sure armhf and armel are supported + as well; thanks to peter green for reporting this and providing the + pointer (Closes: #656274). * debian/README.Debian: - Added section 'Cleanup of old data' explaining how to get rid of out-dated data files (e.g. RRD files). diff --git a/debian/rules b/debian/rules index 5f4eb6d..2df30d9 100755 --- a/debian/rules +++ b/debian/rules @@ -31,9 +31,7 @@ CPPFLAGS += -DCONFIGFILE='\"/etc/collectd/collectd.conf\"' LDFLAGS = `dpkg-buildflags --get LDFLAGS` # The archdir map has been copied from openjdk-6's debian/rules. -JAVA_ARCHDIR_MAP = armel=arm hppa=parisc lpia=i386 powerpc=ppc powerpcspe=ppc sh4=sh -JAVA_ARCHDIR = $(strip $(patsubst $(DEB_BUILD_ARCH)=%, %, \ - $(filter $(DEB_BUILD_ARCH)=%, $(JAVA_ARCHDIR_MAP)))) +JAVA_ARCHDIR = $(shell /usr/share/javahelper/java-arch.sh $(DEB_BUILD_ARCH)) ifeq (,$(JAVA_ARCHDIR)) JAVA_ARCHDIR = $(DEB_BUILD_ARCH) endif -- 2.30.2