From 5917f98137e71b83a662261c81059aad3af35df9 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Thu, 15 Oct 2015 14:15:14 +0200
Subject:   * Bump alpha, kfreebsd-amd64 and kfreebsd-i386 to 1.8.   *
 java_defaults.mk: Add jvm_archdir, jvm_archpath, jvm_includes macros.

---
 debian/java_defaults.mk | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'debian/java_defaults.mk')

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
-- 
cgit v1.2.3