------------------------------------------------------------
revno: 648
committer: Matthias Klose <d...@ubuntu.com>
branch nick: openjdk8
timestamp: Thu 2015-09-03 13:26:27 +0200
message:
* Define _alpha_ / _sh_ preprocessor macros instead of alpha / sh.
added:
debian/patches/jdk-target-arch-define.diff
modified:
debian/changelog
debian/rules
--
lp:~openjdk/openjdk/openjdk8
https://code.launchpad.net/~openjdk/openjdk/openjdk8
Your team Debian Java Maintainers is subscribed to branch
lp:~openjdk/openjdk/openjdk8.
To unsubscribe from this branch go to
https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'debian/changelog'
--- debian/changelog 2015-08-13 12:51:39 +0000
+++ debian/changelog 2015-09-03 11:26:27 +0000
@@ -2,6 +2,7 @@
* Fix installing the openjdk.desktop file when cautious-launch is available.
LP: #1448548.
+ * Define _alpha_ / _sh_ preprocessor macros instead of alpha / sh.
-- Matthias Klose <d...@ubuntu.com> Thu, 13 Aug 2015 14:21:26 +0200
=== added file 'debian/patches/jdk-target-arch-define.diff'
--- debian/patches/jdk-target-arch-define.diff 1970-01-01 00:00:00 +0000
+++ debian/patches/jdk-target-arch-define.diff 2015-09-03 11:26:27 +0000
@@ -0,0 +1,19 @@
+# DP: Define _alpha_ / _sh_ preprocessor macros instead of alpha / sh.
+
+--- a/common/autoconf/toolchain.m4
++++ b/common/autoconf/toolchain.m4
+@@ -1096,7 +1096,13 @@
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DDEBUG"
+ fi
+
+- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
++ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"'"
++ case "$OPENJDK_TARGET_CPU_LEGACY" in
++ alpha*linux*|sh*linux*)
++ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_${OPENJDK_TARGET_CPU_LEGACY}_";;
++ *)
++ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D$OPENJDK_TARGET_CPU_LEGACY"
++ esac
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
+
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
=== modified file 'debian/rules'
--- debian/rules 2015-08-13 12:51:39 +0000
+++ debian/rules 2015-09-03 11:26:27 +0000
@@ -402,6 +402,7 @@
applet-hole.patch \
libjpeg-fix.diff \
sparc-fixes.diff \
+ jdk-target-arch-define.diff \
# FIXME: update patches
#accessible-toolkit.patch # update for 8
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
debian-j...@lists.debian.org for discussions and questions.
