/hg/release/icedtea7-2.4: 3 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Fri Mar 21 17:39:48 UTC 2014


changeset f59e4269da38 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=f59e4269da38
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Feb 21 22:04:31 2014 +0000

	Avoid giving PAX_COMMAND a value if no PaX utility is available.

	2014-02-21  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* acinclude.m4:
		(IT_WITH_PAX): Leave PAX_COMMAND with the empty
		string rather than "not specified" to avoid build
		failures.
		* pax-mark-vm.in: Update PAX_COMMAND check.


changeset 5c3c415fa3ef in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=5c3c415fa3ef
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 21 17:38:41 2014 +0000

	PR1684: Build fails with empty PAX_COMMAND

	2014-02-24  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR1684: Build fails with empty PAX_COMMAND
		* Makefile.am:
		(ICEDTEA_ENV): Only add PAX_COMMAND when defined.
		* NEWS: Updated.


changeset 45b209e92979 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=45b209e92979
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Mar 21 17:39:17 2014 +0000

	Add Gentoo bug reference for PaX update.

	2014-02-24  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* NEWS: Add Gentoo bug reference for
		PaX update.


diffstat:

 ChangeLog      |  20 ++++++++++++++++++++
 Makefile.am    |   8 ++++++--
 NEWS           |   3 ++-
 acinclude.m4   |   7 ++-----
 pax-mark-vm.in |   2 +-
 5 files changed, 31 insertions(+), 9 deletions(-)

diffs (102 lines):

diff -r a03874670653 -r 45b209e92979 ChangeLog
--- a/ChangeLog	Mon Mar 17 16:42:38 2014 +0000
+++ b/ChangeLog	Fri Mar 21 17:39:17 2014 +0000
@@ -1,3 +1,23 @@
+2014-02-24  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* NEWS: Add Gentoo bug reference for
+	PaX update.
+
+2014-02-24  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR1684: Build fails with empty PAX_COMMAND
+	* Makefile.am:
+	(ICEDTEA_ENV): Only add PAX_COMMAND when defined.
+	* NEWS: Updated.
+
+2014-02-21  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* acinclude.m4:
+	(IT_WITH_PAX): Leave PAX_COMMAND with the empty
+	string rather than "not specified" to avoid build
+	failures.
+	* pax-mark-vm.in: Update PAX_COMMAND check.
+
 2014-02-19  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* patches/boot/test_gamma.patch,
diff -r a03874670653 -r 45b209e92979 Makefile.am
--- a/Makefile.am	Mon Mar 17 16:42:38 2014 +0000
+++ b/Makefile.am	Fri Mar 21 17:39:17 2014 +0000
@@ -484,8 +484,7 @@
 	JAVAC_WARNINGS_FATAL="$(WERROR_STATUS)" \
 	COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \
 	UNLIMITED_CRYPTO="true" \
-	ARM32JIT="${ARM32JIT_STATUS}" \
-	PAX_COMMAND="${PAX_COMMAND}"
+	ARM32JIT="${ARM32JIT_STATUS}"
 
 if ENABLE_CACAO
 ICEDTEA_ENV += \
@@ -596,6 +595,11 @@
 	KRB5_CFLAGS="${KRB5_CFLAGS}"
 endif
 
+if WITH_PAX
+ICEDTEA_ENV += \
+	PAX_COMMAND="${PAX_COMMAND}"
+endif
+
 # OpenJDK boot build environment.
 ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
 	BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
diff -r a03874670653 -r 45b209e92979 NEWS
--- a/NEWS	Mon Mar 17 16:42:38 2014 +0000
+++ b/NEWS	Fri Mar 21 17:39:17 2014 +0000
@@ -20,8 +20,9 @@
 * Bug fixes
   - PR1101: Undefined symbols on GNU/Linux SPARC
   - PR1659: OpenJDK 7 returns incorrect TrueType font metrics when bold style is set
-  - PR1677: Update PaX support to detect running PaX kernel and use newer tools
+  - PR1677, G498288: Update PaX support to detect running PaX kernel and use newer tools
   - PR1679: Allow OpenJDK to build on PaX-enabled kernels
+  - PR1684: Build fails with empty PAX_COMMAND
   - RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError (revised fix)
   - Link against $(LIBDL) if SYSTEM_CUPS is not true
 * ARM port
diff -r a03874670653 -r 45b209e92979 acinclude.m4
--- a/acinclude.m4	Mon Mar 17 16:42:38 2014 +0000
+++ b/acinclude.m4	Fri Mar 21 17:39:17 2014 +0000
@@ -2356,10 +2356,7 @@
       fi
     fi
   fi
-  if test -z "${PAX_COMMAND}"; then
-    PAX_COMMAND="not specified"
-    PAX_COMMAND_ARGS="not specified"
-  else
+  if test -n "${PAX_COMMAND}"; then
     AC_MSG_CHECKING([which options to pass to ${PAX_COMMAND}])
     case "${host_cpu}" in
       i?86)
@@ -2371,7 +2368,7 @@
     esac
     AC_MSG_RESULT(${PAX_COMMAND_ARGS})
   fi
-  AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified")
+  AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "x")
   AC_SUBST(PAX_COMMAND)
   AC_SUBST(PAX_COMMAND_ARGS)
 ])
diff -r a03874670653 -r 45b209e92979 pax-mark-vm.in
--- a/pax-mark-vm.in	Mon Mar 17 16:42:38 2014 +0000
+++ b/pax-mark-vm.in	Fri Mar 21 17:39:17 2014 +0000
@@ -5,7 +5,7 @@
 	file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//'
 }
 
-if test "@PAX_COMMAND@" != "not specified"; then
+if test "x at PAX_COMMAND@" != "x"; then
 	for paxable in `list_paxables "${1}"/bin/* "${1}"/jre/bin/*`; do
 		echo "PaX mark @PAX_COMMAND_ARGS@ ${paxable}"
 		@PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"


More information about the distro-pkg-dev mailing list