From b80b4caa56d35bdd2c1612ad35ac4f97b9868d51 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 26 Jul 2009 22:16:14 +0200 Subject: [PATCH] rules: Use -rpath to tell the "java" plugin where to find libjvm.so. --- debian/changelog | 3 ++- debian/rules | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 71a1e50..160a96e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ collectd (4.7.2-1) unstable; urgency=low configure, using OpenJDK found in /usr/lib/jvm/java-6-openjdk. The archdir mapping used by the openjdk-6 Debian package is used to find libjvm.so in JAVA_HOME/jre/lib/ARCHDIR/server. + - Use -rpath to tell the "java" plugin where to find libjvm.so. - Pass --enable-all-plugins to configure to make sure that the build fails if any prerequisites are missing. * debian/control: @@ -37,7 +38,7 @@ collectd (4.7.2-1) unstable; urgency=low version 4 of collectd - the script now supports the --recursive option which takes care of that. - -- Sebastian Harl Thu, 23 Jul 2009 23:35:03 +0200 + -- Sebastian Harl Sun, 26 Jul 2009 22:14:25 +0200 collectd (4.6.3-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 0d8a9b1..6b2c105 100755 --- a/debian/rules +++ b/debian/rules @@ -39,10 +39,11 @@ JAVA_ARCHDIR_MAP = alpha=alpha arm=arm armel=arm amd64=amd64 hppa=parisc \ JAVA_ARCHDIR = $(strip $(patsubst $(DEB_BUILD_ARCH)=%, %, \ $(filter $(DEB_BUILD_ARCH)=%, $(JAVA_ARCHDIR_MAP)))) JAVA_HOME = /usr/lib/jvm/java-6-openjdk +JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server JAVAC = $(JAVA_HOME)/bin/javac JAVA_CPPFLAGS = -I$(JAVA_HOME)/include -JAVA_LDFLAGS = -L$(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server +JAVA_LDFLAGS = -L$(JAVA_LIBDIR) -Wl,-rpath -Wl,$(JAVA_LIBDIR) include /usr/share/dpatch/dpatch.make -- 2.30.2