Mercurial > hg > release > icedtea-web-1.4
changeset 794:1d4c7bc579d8
Make sure that path to PUBLIC_KEYSTORE exists to prevent keytool fail and put link flags to the end of gcc command line to prevent link failures
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Wed, 19 Feb 2014 15:38:50 +0100 |
| parents | 50e472e1275f |
| children | 9eadfcabb570 |
| files | ChangeLog Makefile.am tests/softkiller/Makefile |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Feb 05 12:56:23 2014 +0100 +++ b/ChangeLog Wed Feb 19 15:38:50 2014 +0100 @@ -1,3 +1,10 @@ +2014-02-19 Michal Vyskocil <mvyskocil@suse.com> + + Put link flags to the end of gcc command line to prevent link failures + Make sure that path to PUBLIC_KEYSTORE exists to prevent keytool fail + * tests/softkiller/Makefile: put -lX11 to the end of command line + * Makefile.am: if path to PUBLIC_KEYSTORE does not exists, make it + 2014-02-04 Jiri Vanek <jvanek@redhat.com> Added salt to plugin-java pipes' directory (fixing RH1010958)
--- a/Makefile.am Wed Feb 05 12:56:23 2014 +0100 +++ b/Makefile.am Wed Feb 19 15:38:50 2014 +0100 @@ -39,7 +39,8 @@ export EXPORTED_TEST_CERT_PREFIX=icedteatests export EXPORTED_TEST_CERT_SUFFIX=crt export TEST_CERT_ALIAS=icedteaweb -export PUBLIC_KEYSTORE=${HOME}/.icedtea/security/trusted.certs +export PUBLIC_KEYSTORE_DIR=${HOME}/.icedtea/security +export PUBLIC_KEYSTORE=$(PUBLIC_KEYSTORE_DIR)/trusted.certs export PUBLIC_KEYSTORE_PASS=changeit export SOFTKILLER=softkiller @@ -642,6 +643,7 @@ touch $@ stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs stamps/liveconnect-dist.stamp stamps/netx-dist.stamp stamps/plugin.stamp + mkdir -p $(PUBLIC_KEYSTORE_DIR) ; \ types=($(ALL_NONCUSTOM_REPRODUCERS)); \ for which in "$${types[@]}" ; do \ . $(abs_top_srcdir)/NEW_LINE_IFS ; \
--- a/tests/softkiller/Makefile Wed Feb 05 12:56:23 2014 +0100 +++ b/tests/softkiller/Makefile Wed Feb 19 15:38:50 2014 +0100 @@ -2,7 +2,7 @@ # (this function does not exist in C89/ANSI C) softkiller: softkiller.c - $(CC) -Wall -pedantic -std=c99 -o $@ -lX11 $< + $(CC) -Wall -pedantic -std=c99 -o $@ $< -lX11 clean: rm softkiller