------------------------------------------------------------
revno: 649
committer: Matthias Klose <d...@ubuntu.com>
branch nick: openjdk8
timestamp: Thu 2015-09-03 13:46:49 +0200
message:
* Fix jdk gensrc build on x32.
modified:
debian/changelog
debian/patches/zero-x32.diff
--
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-09-03 11:26:27 +0000
+++ debian/changelog 2015-09-03 11:46:49 +0000
@@ -3,6 +3,7 @@
* Fix installing the openjdk.desktop file when cautious-launch is available.
LP: #1448548.
* Define _alpha_ / _sh_ preprocessor macros instead of alpha / sh.
+ * Fix jdk gensrc build on x32.
-- Matthias Klose <d...@ubuntu.com> Thu, 13 Aug 2015 14:21:26 +0200
=== modified file 'debian/patches/zero-x32.diff'
--- debian/patches/zero-x32.diff 2015-07-06 17:50:26 +0000
+++ debian/patches/zero-x32.diff 2015-09-03 11:46:49 +0000
@@ -78,3 +78,17 @@
x86) ZERO_ARCHDEF=IA32 ;;
*) ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
esac
+--- a/jdk/make/gensrc/GensrcX11Wrappers.gmk
++++ b/jdk/make/gensrc/GensrcX11Wrappers.gmk
+@@ -87,9 +87,11 @@
+ $(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $*
+
+ # use -m32/-m64 only if the compiler supports it
++ ifneq ($(OPENJDK_TARGET_CPU),x32)
+ ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG), true)
+ MEMORY_MODEL_FLAG="$(COMPILER_TARGET_BITS_FLAG)$*"
+ endif
++ endif
+
+ # Compile the C code into an executable.
+ $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
__
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.
