/hg/release/icedtea7-forest-2.3: PR1679: Allow OpenJDK to build ...

[andrew at icedtea.classpath.org]

changeset 14181eb6c00d in /hg/release/icedtea7-forest-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3?cmd=changeset;node=14181eb6c00d
author: andrew
date: Wed Feb 19 21:07:59 2014 +0000

	PR1679: Allow OpenJDK to build on PaX-enabled kernels


diffstat:

 make/Defs-internal.gmk |  14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 66eecafe5565 -r 14181eb6c00d make/Defs-internal.gmk
--- a/make/Defs-internal.gmk	Tue Jan 14 20:24:44 2014 -0500
+++ b/make/Defs-internal.gmk	Wed Feb 19 21:07:59 2014 +0000
@@ -303,6 +303,16 @@
   ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist
 endif
 
+# Command to PaX mark the VM
+ifndef PAX_COMMAND
+  PAX_COMMAND = /usr/sbin/paxmark.sh
+endif
+ifeq ($(ARCH), i586)
+  PAX_COMMAND_ARGS="-msp"
+else
+  PAX_COMMAND_ARGS="-m"
+endif
+
 # Common make arguments (supplied to all component builds)
 COMMON_BUILD_ARGUMENTS = \
     JDK_TOPDIR=$(ABS_JDK_TOPDIR) \
@@ -323,7 +333,9 @@
     PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \
     PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \
     PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) \
-    STATIC_CXX=$(STATIC_CXX)
+    STATIC_CXX=$(STATIC_CXX) \
+    PAX_COMMAND=$(PAX_COMMAND) \
+    PAX_COMMAND_ARGS=$(PAX_COMMAND_ARGS)
 
 ifdef ARCH_DATA_MODEL
   COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)