[java-common] 01/01: * Bump alpha, kfreebsd-amd64 and kfreebsd-i386 to 1.8. * java_defaults.mk: Add jvm_archdir, jvm_archpath, jvm_includes macros.

[Matthias Klose]

This is an automated email from the git hooks/post-receive script.

doko pushed a commit to branch master
in repository java-common.

commit 5917f98137e71b83a662261c81059aad3af35df9
Author: Matthias Klose <doko at ubuntu.com>
Date:   Thu Oct 15 14:15:14 2015 +0200

      * Bump alpha, kfreebsd-amd64 and kfreebsd-i386 to 1.8.
      * java_defaults.mk: Add jvm_archdir, jvm_archpath, jvm_includes macros.
---
 debian/changelog        |  7 ++++++-
 debian/java_defaults.mk | 21 +++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb3b8a7..6c1ccc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 java-common (0.54) UNRELEASED; urgency=medium
 
+  [ Emmanuel Bourg ]
   * Team upload.
   * Use OpenJDK 8 on mips, mipsel and mips64el.
   * Added a new default-java-plugin package depending on the right plugin
@@ -24,7 +25,11 @@ java-common (0.54) UNRELEASED; urgency=medium
   * Simplified debian/rules using the dh sequencer
   * Removed the default values for Java 6 (no longer used)
 
- -- Emmanuel Bourg <ebourg at apache.org>  Tue, 22 Sep 2015 09:23:34 +0200
+  [ Matthias Klose ]
+  * Bump alpha, kfreebsd-amd64 and kfreebsd-i386 to 1.8.
+  * java_defaults.mk: Add jvm_archdir, jvm_archpath, jvm_includes macros.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 15 Oct 2015 14:12:22 +0200
 
 java-common (0.53) experimental; urgency=medium
 
diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk
index b5877a9..5b03318 100644
--- a/debian/java_defaults.mk
+++ b/debian/java_defaults.mk
@@ -4,13 +4,13 @@
 
 java9_architectures =
 java8_architectures = $(java9_architectures) \
-		amd64 arm64 armel armhf i386 \
+		alpha md64 arm64 armel armhf i386 \
 		mips mipsel mips64el \
 		powerpc powerpcspe ppc64 ppc64el \
-		s390x x32
-java7_architectures = $(java8_architectures) \
-		alpha lpia sh4 \
+		s390x x32 \
 		kfreebsd-amd64 kfreebsd-i386
+java7_architectures = $(java8_architectures) \
+		sh4
 java6_architectures = $(java7_architectures)
 java5_architectures = $(java6_architectures) \
 		hppa ia64 m68k s390 sparc sparc64 \
@@ -49,3 +49,16 @@ ifneq (,$(filter $(java_default_version), 9))
 else
   jvm_archpath := jre/lib/$(jvm_archdir)
 endif
+
+_jvm_osinclude = linux
+ifeq ($(java_default_version),5)
+  jvm_includes = \
+	-I/usr/lib/jvm/java-gcj/include -I/usr/lib/jvm/java-gcj/include/$(_jvm_osinclude)
+else
+  ifeq (,$(filter $(java_default_version), 6 7))
+    _jvm_osinclude = $(if $(findstring kfreebsd,$(_java_host_arch)),bsd,linux)
+  endif
+  jvm_includes = \
+	-I/usr/lib/jvm/java-$(java_default_version)-openjdk-$(_java_host_arch)/include \
+	-I/usr/lib/jvm/java-$(java_default_version)-openjdk-$(_java_host_arch)/include/$(_jvm_osinclude)
+endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-common.git