Mercurial > hg > release > icedtea7-2.4
changeset 2706:5c3c415fa3ef
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 | Fri, 21 Mar 2014 17:38:41 +0000 |
| parents | f59e4269da38 |
| children | 45b209e92979 |
| 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 Fri Mar 21 17:38:41 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 Fri Mar 21 17:38:41 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)" \
--- a/NEWS Fri Feb 21 22:04:31 2014 +0000 +++ b/NEWS Fri Mar 21 17:38:41 2014 +0000 @@ -22,6 +22,7 @@ - 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 - 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