Mercurial > hg > release > icedtea-web-1.5
changeset 896:db83ddf35fc0
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:39:02 +0100 |
| parents | d2563e68c74a |
| children | 877209479c2f |
| files | ChangeLog Makefile.am tests/softkiller/Makefile |
| diffstat | 3 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Feb 13 12:56:17 2014 +0100 +++ b/ChangeLog Wed Feb 19 15:39:02 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-13 Jiri Vanek <jvanek@redhat.com> Get rid of ConcurrentModificationException in Console output.
--- a/Makefile.am Thu Feb 13 12:56:17 2014 +0100 +++ b/Makefile.am Wed Feb 19 15:39:02 2014 +0100 @@ -735,6 +735,8 @@ PUBLIC_KEYSTORE=${HOME}/.config ; \ fi ;\ PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ + keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \ + [ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \ for which in "$${types[@]}" ; do \ $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) ; \ done ; @@ -752,6 +754,8 @@ PUBLIC_KEYSTORE=${HOME}/.config ; \ fi ;\ PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ + keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \ + [ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \ for which in "$${types[@]}" ; do \ yes | $(BOOT_DIR)/bin/keytool -import -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) ;\ done ; @@ -765,6 +769,8 @@ PUBLIC_KEYSTORE=${HOME}/.config ; \ fi ;\ PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ + keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \ + [ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \ for which in "$${types[@]}" ; do \ $(BOOT_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) ; \ done ;
--- a/tests/softkiller/Makefile Thu Feb 13 12:56:17 2014 +0100 +++ b/tests/softkiller/Makefile Wed Feb 19 15:39:02 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