Mercurial > hg > release > icedtea6-1.13
changeset 2976:44dda0c0c865
PR1336: Bootstrap failure on Fedora 17/18
2013-04-12 Andrew John Hughes <gnu.andrew@redhat.com>
PR1336: Bootstrap failure on Fedora 17/18
* Makefile.am:
(ICEDTEA_BOOTSTRAP_CLASSES): Add SSLParameters
if needed.
* configure.ac: Check for javax.net.ssl.SSLParameters.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Sun, 14 Apr 2013 21:05:17 +0100 |
| parents | bcad714e7c48 |
| children | db7918fff199 |
| files | ChangeLog Makefile.am configure.ac |
| diffstat | 3 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Apr 12 22:06:38 2013 +0100 +++ b/ChangeLog Sun Apr 14 21:05:17 2013 +0100 @@ -1,3 +1,11 @@ +2013-04-12 Andrew John Hughes <gnu.andrew@redhat.com> + + PR1336: Bootstrap failure on Fedora 17/18 + * Makefile.am: + (ICEDTEA_BOOTSTRAP_CLASSES): Add SSLParameters + if needed. + * configure.ac: Check for javax.net.ssl.SSLParameters. + 2013-04-12 Andrew John Hughes <gnu.andrew@redhat.com> * NEWS: Add PR1362 from last commit.
--- a/Makefile.am Fri Apr 12 22:06:38 2013 +0100 +++ b/Makefile.am Sun Apr 14 21:05:17 2013 +0100 @@ -127,6 +127,12 @@ $(SHARE)/javax/security/sasl/Sasl.java endif +# PR 56553 - SSLParameters support missing +if LACKS_SSLPARAMETERS +ICEDTEA_BOOTSTRAP_CLASSES += \ + $(SHARE)/javax/net/ssl/SSLParameters.java +endif + # Flags MEMORY_LIMIT = -J-Xmx1024m IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
--- a/configure.ac Fri Apr 12 22:06:38 2013 +0100 +++ b/configure.ac Sun Apr 14 21:05:17 2013 +0100 @@ -118,6 +118,9 @@ # PR54275 - sun.security.sasl requires missing Sasl.CREDENTIALS field IT_CHECK_FOR_STATIC_FIELD([JAVAX_SECURITY_SASL_SASL_CREDENTIALS],[CREDENTIALS],[javax.security.sasl.Sasl]) +# PR 56553 - SSLParameters support missing +IT_CHECK_FOR_CLASS([SSLPARAMETERS],[javax.net.ssl.SSLParameters]) + # Use xvfb-run if found to run gui tests (check-jdk). AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], []) AC_SUBST(XVFB_RUN_CMD)