Mercurial > hg > release > icedtea7-2.3
changeset 2693:358293cf091b
Avoid giving PAX_COMMAND a value if no PaX utility is available.
2014-02-21 Andrew John Hughes <gnu.andrew@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.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 21 Feb 2014 22:04:31 +0000 |
| parents | 2df0b6e6b67f |
| children | 752098160f94 |
| files | ChangeLog acinclude.m4 pax-mark-vm.in |
| diffstat | 3 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Mar 21 20:25:44 2014 +0000 +++ b/ChangeLog Fri Feb 21 22:04:31 2014 +0000 @@ -1,3 +1,11 @@ +2014-02-21 Andrew John Hughes <gnu.andrew@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-03-21 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: List bootstrap fix.
--- a/acinclude.m4 Fri Mar 21 20:25:44 2014 +0000 +++ b/acinclude.m4 Fri Feb 21 22:04:31 2014 +0000 @@ -2296,10 +2296,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) @@ -2311,7 +2308,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) ])
--- a/pax-mark-vm.in Fri Mar 21 20:25:44 2014 +0000 +++ b/pax-mark-vm.in Fri Feb 21 22:04:31 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@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}"