This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository openjdk-7-jre-dcevm.
commit ce109ac016eeae668b19737e8eb9da9bccd40c81 Author: Emmanuel Bourg <[email protected]> Date: Fri Sep 12 09:52:00 2014 -0400 Fixed a build failure on i386 (Closes: #760304) --- debian/changelog | 6 ++++++ debian/rules | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 34719d2..cb22bf2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openjdk-7-jre-dcevm (7u60-2) UNRELEASED; urgency=medium + + * Fixed a build failure on i386 (Closes: #760304) + + -- Emmanuel Bourg <[email protected]> Fri, 12 Sep 2014 09:50:39 -0400 + openjdk-7-jre-dcevm (7u60-1) unstable; urgency=medium * New upstream release diff --git a/debian/rules b/debian/rules index 27cfdab..d134407 100755 --- a/debian/rules +++ b/debian/rules @@ -8,8 +8,10 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) ifneq (,$(filter $(DEB_HOST_ARCH), amd64)) ARCH_DATA_MODEL=64 + JDK_ARCH=amd64 else ifneq (,$(filter $(DEB_HOST_ARCH), i386)) ARCH_DATA_MODEL=32 + JDK_ARCH=i586 endif JAVA_HOME = /usr/lib/jvm/java-7-openjdk-$(DEB_HOST_ARCH) @@ -27,7 +29,7 @@ override_dh_auto_build: override_dh_install: dh_install -p$(PACKAGE) \ - build/linux/export-linux-$(DEB_HOST_ARCH)/jre/lib/$(DEB_HOST_ARCH)/server/libjvm.so \ + build/linux/export-linux-$(JDK_ARCH)/jre/lib/$(DEB_HOST_ARCH)/server/libjvm.so \ $(JAVA_HOME)/jre/lib/$(DEB_HOST_ARCH)/dcevm override_dh_clean: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-7-jre-dcevm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
