Mercurial > hg > release > icedtea7-2.5
changeset 2690:49b36369152d
PR1684: Build fails with empty PAX_COMMAND
2014-02-24 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR1684: Build fails with empty PAX_COMMAND
* Makefile.am:
(ICEDTEA_ENV): Only add PAX_COMMAND when defined.
* NEWS: Updated.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Mon, 24 Feb 2014 15:59:54 +0000 |
parents | ffb3f0d91d72 |
children | 74d5e26fce82 |
files | ChangeLog Makefile.am NEWS |
diffstat | 3 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Feb 21 22:04:31 2014 +0000 +++ b/ChangeLog Mon Feb 24 15:59:54 2014 +0000 @@ -1,3 +1,10 @@ +2014-02-24 Andrew John Hughes <gnu.andrew@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@member.fsf.org> * acinclude.m4:
--- a/Makefile.am Fri Feb 21 22:04:31 2014 +0000 +++ b/Makefile.am Mon Feb 24 15:59:54 2014 +0000 @@ -514,8 +514,7 @@ PCSC_LIBS="${PCSC_LIBS}" \ PCSC_CFLAGS="${PCSC_CFLAGS}" \ COMPRESS_JARS="${ENABLE_JAR_COMPRESSION}" \ - ARM32JIT="${ARM32JIT_STATUS}" \ - PAX_COMMAND="${PAX_COMMAND}" + ARM32JIT="${ARM32JIT_STATUS}" if ENABLE_CACAO ICEDTEA_ENV += \ @@ -553,6 +552,11 @@ RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar" 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)" \
--- a/NEWS Fri Feb 21 22:04:31 2014 +0000 +++ b/NEWS Mon Feb 24 15:59:54 2014 +0000 @@ -159,6 +159,7 @@ - Remove duplicate ElfFuncDescTable code in elfSymbolTable.hpp - PR1677: 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 * PPC & AIX port - Add AIX-specific build instructions to README-ppc.html - Added AIX as testing platform for more jtreg tests written in shell-script