Mercurial > hg > icedtea8
changeset 2689:46f8680e14e0
PR2821: Support building OpenJDK with --disable-headful
2016-07-17 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR2821: Support building OpenJDK
with --disable-headful
* INSTALL: Document --enable-headless.
* Makefile.am:
(ICEDTEA_CONFIGURE): Pass --disable-headful
when BUILD_HEADLESS is set.
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_NON_NSS_CURVES): Make sure all
possible values of enableval are handled.
(IT_ENABLE_HEADLESS): Allow OpenJDK to
be built without graphical UI support.
* configure.ac:
Invoke IT_ENABLE_HEADLESS.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Mon, 18 Jul 2016 04:11:46 +0100 |
| parents | 5d33e9d507a1 |
| children | 27ceed26e16e |
| files | ChangeLog INSTALL Makefile.am NEWS acinclude.m4 configure.ac |
| diffstat | 6 files changed, 56 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jul 17 22:00:50 2016 +0100 +++ b/ChangeLog Mon Jul 18 04:11:46 2016 +0100 @@ -1,3 +1,20 @@ +2016-07-17 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR2821: Support building OpenJDK + with --disable-headful + * INSTALL: Document --enable-headless. + * Makefile.am: + (ICEDTEA_CONFIGURE): Pass --disable-headful + when BUILD_HEADLESS is set. + * NEWS: Updated. + * acinclude.m4: + (IT_ENABLE_NON_NSS_CURVES): Make sure all + possible values of enableval are handled. + (IT_ENABLE_HEADLESS): Allow OpenJDK to + be built without graphical UI support. + * configure.ac: + Invoke IT_ENABLE_HEADLESS. + 2016-07-17 Andrew John Hughes <gnu.andrew@member.fsf.org> PR2822: Feed LIBS & CFLAGS into configure
--- a/INSTALL Sun Jul 17 22:00:50 2016 +0100 +++ b/INSTALL Mon Jul 18 04:11:46 2016 +0100 @@ -213,6 +213,7 @@ * --enable-sunec: Build the SunEC crypto provider against system NSS. * --enable-non-nss-curves: Define curves beyond the three specified by NSS (NIST P-{256,384,521}) * --enable-infinality: Use fontconfig for better font rendering +* --enable-headless: Build OpenJDK without graphical UI support Testing =======
--- a/Makefile.am Sun Jul 17 22:00:50 2016 +0100 +++ b/Makefile.am Mon Jul 18 04:11:46 2016 +0100 @@ -518,6 +518,11 @@ --disable-infinality endif +if BUILD_HEADLESS +ICEDTEA_CONFIGURE += \ + --disable-headful +endif + ICEDTEA_UNSET = \ JAVAC= \ JAVA_HOME= \
--- a/NEWS Sun Jul 17 22:00:50 2016 +0100 +++ b/NEWS Mon Jul 18 04:11:46 2016 +0100 @@ -180,6 +180,7 @@ - S8159690, PR3077: [TESTBUG] Mark headful tests with @key headful. * Bug fixes - PR1958: GTKLookAndFeel does not honor gtk-alternative-button-order + - PR2821: Support building OpenJDK with --disable-headful - PR2822: Feed LIBS & CFLAGS into configure rather than make to avoid re-discovery by OpenJDK configure - PR2931, G478960: Provide Infinality Support via fontconfig - PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
--- a/acinclude.m4 Sun Jul 17 22:00:50 2016 +0100 +++ b/acinclude.m4 Mon Jul 18 04:11:46 2016 +0100 @@ -2319,7 +2319,14 @@ AC_ARG_ENABLE([non-nss-curves], [AS_HELP_STRING(--enable-non-nss-curves,register curves beyond the 3 NSS defines [[default=no]])], [ - ENABLE_NON_NSS_CURVES="${enableval}" + case "${enableval}" in + no) + ENABLE_NON_NSS_CURVES=no + ;; + *) + ENABLE_NON_NSS_CURVES=yes + ;; + esac ], [ ENABLE_NON_NSS_CURVES="no" @@ -2328,3 +2335,26 @@ AM_CONDITIONAL(USE_NON_NSS_CURVES, test x"${ENABLE_NON_NSS_CURVES}" = "xyes") AC_SUBST(ENABLE_NON_NSS_CURVES) ]) + +AC_DEFUN_ONCE([IT_ENABLE_HEADLESS], +[ + AC_MSG_CHECKING([whether to perform a headless build of OpenJDK]) + AC_ARG_ENABLE([headless], + [AS_HELP_STRING(--enable-headless,perform a build of OpenJDK without graphical UI support [[default=no]])], + [ + case "${enableval}" in + no) + ENABLE_HEADLESS=no + ;; + *) + ENABLE_HEADLESS=yes + ;; + esac + ], + [ + ENABLE_HEADLESS="no" + ]) + AC_MSG_RESULT(${ENABLE_HEADLESS}) + AM_CONDITIONAL(BUILD_HEADLESS, test x"${ENABLE_HEADLESS}" = "xyes") + AC_SUBST(ENABLE_HEADLESS) +])