summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/rules.defs2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 4d3faa8..d4788a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gcc-4.9 (4.9.0-11) UNRELEASED; urgency=medium
* Add libstdc++ symbols files for mips64 and mips64el (Yunqiang Su).
Closes: #745372.
+ * Set java_cpu to ppc64 on ppc64el.
-- Matthias Klose <doko@debian.org> Mon, 07 Jul 2014 12:56:54 +0200
diff --git a/debian/rules.defs b/debian/rules.defs
index 3cfd806..d581d5a 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -657,7 +657,7 @@ with_java_plugin := no
ifeq ($(with_java),yes)
# use the same names as OpenJDK
- java_cpu_map = armel=arm armhf=arm hppa=parisc i686=i386 i586=i386 i486=i386 mipsel=mips mips64=mips mips64el=mips mipsn32=mips mipsn32el=mips powerpc=ppc sh4=sh x32=x32
+ java_cpu_map = armel=arm armhf=arm hppa=parisc i686=i386 i586=i386 i486=i386 mipsel=mips mips64=mips mips64el=mips mipsn32=mips mipsn32el=mips powerpc=ppc ppc64el=ppc64 sh4=sh x32=x32
java_cpu = $(patsubst $(DEB_TARGET_ARCH_CPU)=%,%, \
$(filter $(DEB_TARGET_ARCH_CPU)=%,$(java_cpu_map)))
ifeq (,$(java_cpu))