diff options
| author | Emmanuel Bourg <ebourg@apache.org> | 2015-10-11 22:08:03 +0200 |
|---|---|---|
| committer | Emmanuel Bourg <ebourg@apache.org> | 2015-10-11 22:08:03 +0200 |
| commit | 86296d83caa55469f5e49d593bacc5ce37693e2c (patch) | |
| tree | fd08233d16fd189e741df39bf85838c45252665c | |
| parent | d367baadd4acaffd9074fd9dd296c78bf0e1c130 (diff) | |
| parent | 03792973a51621889b8861d215c1a8a8a0b02395 (diff) | |
| download | java-common-86296d83caa55469f5e49d593bacc5ce37693e2c.tar.gz | |
Merge branch '0.52.1'
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/java_defaults.mk | 25 |
2 files changed, 31 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 8cbe5b7..cb3b8a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,14 @@ java-common (0.53) experimental; urgency=medium -- Emmanuel Bourg <ebourg@apache.org> Tue, 01 Sep 2015 23:11:54 +0200 +java-common (0.52.1) unstable; urgency=medium + + * Team upload. + * Bump kfreebsd-amd64 kfreebsd-i386 to 1.7 again. + * java_defaults.mk: Add jvm_archdir and jvm_archpath macros. + + -- Matthias Klose <doko@debian.org> Sun, 11 Oct 2015 09:40:26 +0200 + java-common (0.52) unstable; urgency=medium * Team upload. diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk index dc20ecc..b5877a9 100644 --- a/debian/java_defaults.mk +++ b/debian/java_defaults.mk @@ -9,11 +9,12 @@ java8_architectures = $(java9_architectures) \ powerpc powerpcspe ppc64 ppc64el \ s390x x32 java7_architectures = $(java8_architectures) \ - alpha lpia sh4 + alpha lpia sh4 \ + kfreebsd-amd64 kfreebsd-i386 java6_architectures = $(java7_architectures) java5_architectures = $(java6_architectures) \ hppa ia64 m68k s390 sparc sparc64 \ - kfreebsd-amd64 kfreebsd-i386 hurd-i386 + hurd-i386 java_architectures = $(java5_architectures) _java_host_arch := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH)) @@ -28,3 +29,23 @@ else ifneq (,$(filter $(_java_host_arch),$(java6_architectures))) else ifneq (,$(filter $(_java_host_arch),$(java5_architectures))) java_default_version = 5 endif + +# jvm_archdir is the directory for architecture specific files / libraries +# in <JAVA_HOME>/jre/lib/<jvm_archdir> or <JAVA_HOME>/lib/<jvm_archdir> +# jvm_archpath is the relative path of jvm_archdir in JAVA_HOME. + +_java_host_cpu := $(if $(DEB_HOST_ARCH_CPU),$(DEB_HOST_ARCH_CPU),$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)) +jvm_archdir_map = \ + alpha=alpha armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc \ + i386=i386 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el \ + powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le \ + sparc=sparc sparc64=sparc64 sh4=sh s390x=s390x ia64=ia64 x32=x32 + +jvm_archdir := \ + $(strip $(patsubst $(_java_host_cpu)=%, %, $(filter $(_java_host_cpu)=%, $(jvm_arch_map)))) + +ifneq (,$(filter $(java_default_version), 9)) + jvm_archpath := lib/$(jvm_archdir) +else + jvm_archpath := jre/lib/$(jvm_archdir) +endif |