# HG changeset patch # User Andrew John Hughes # Date 1471237489 -3600 # Node ID 25bd6515fed0b2fbc53bf770502d2eaacc756e66 # Parent 4c2bd990d28a139b208eb82a87a8946c18acfa0d PR1372: Provide option to build without debugging 2014-06-10 Andrew John Hughes PR1372: Provide option to build without debugging * INSTALL: Updated. * Makefile.am: (ICEDTEA_ENV): Only set DEBUG_CLASSFILES and DEBUG_BINARIES when ENABLE_JAVA_DEBUGINFO and ENABLE_NATIVE_DEBUGINFO are set, respectively. * NEWS: Updated. * acinclude.m4: (IT_ENABLE_NATIVE_DEBUGINFO): New macro to add option --enable-native-debuginfo. (IT_ENABLE_JAVA_DEBUGINFO): New macro to add option --enable-java-debuginfo. * configure.ac: Invoke new macros. diff -r 4c2bd990d28a -r 25bd6515fed0 ChangeLog --- a/ChangeLog Mon Aug 15 05:37:57 2016 +0100 +++ b/ChangeLog Mon Aug 15 06:04:49 2016 +0100 @@ -1,3 +1,19 @@ +2014-06-10 Andrew John Hughes + + PR1372: Provide option to build without debugging + * INSTALL: Updated. + * Makefile.am: + (ICEDTEA_ENV): Only set DEBUG_CLASSFILES + and DEBUG_BINARIES when ENABLE_JAVA_DEBUGINFO + and ENABLE_NATIVE_DEBUGINFO are set, respectively. + * NEWS: Updated. + * acinclude.m4: + (IT_ENABLE_NATIVE_DEBUGINFO): New macro to add + option --enable-native-debuginfo. + (IT_ENABLE_JAVA_DEBUGINFO): New macro to add + option --enable-java-debuginfo. + * configure.ac: Invoke new macros. + 2016-07-26 Andrew John Hughes PR2800: Files are missing from resources.jar diff -r 4c2bd990d28a -r 25bd6515fed0 INSTALL --- a/INSTALL Mon Aug 15 05:37:57 2016 +0100 +++ b/INSTALL Mon Aug 15 06:04:49 2016 +0100 @@ -93,11 +93,6 @@ * --disable-optimizations: Build with -O0. * --enable-hg: Checkout the OpenJDK tree from Mercurial, rather than downloading and extracting a tarball. -* --enable-system-lcms: Build using the system installation of LCMS2, not - the version in-tree. -* --enable-system-kerberos: Link against the system Kerberos library and - query it at runtime to obtain the cache location, rather than using a - hardcoded value. * --with-gcj: Compile ecj to native code with gcj prior to building. * --with-parallel-jobs: Run the specified number of parallel jobs when building HotSpot and the JDK. If this option is passed without an @@ -151,6 +146,8 @@ * --disable-downloading: Don't download tarballs if not available; fail instead. * --disable-bootstrap-tools: Use javac and javah from langtools, not the bootstrap JDK. * --with-fonts-dir: Specify the location of system fonts. This is currently only used on Gentoo systems. +* --enable-native-debuginfo: Include debuginfo in native binaries. +* --enable-java-debuginfo: Include debuginfo in Java class files. Other options may be supplied which enable or disable new features. These are documented fully in the relevant section below. @@ -173,6 +170,11 @@ below. * --enable-lcms2: Use LCMS 2 backport from OpenJDK 7 rather than LCMS 1. * --enable-non-nss-curves: Define curves beyond the three specified by NSS (NIST P-{256,384,521}) +* --enable-system-lcms: Build using the system installation of LCMS2, not + the version in-tree. +* --enable-system-kerberos: Link against the system Kerberos library and + query it at runtime to obtain the cache location, rather than using a + hardcoded value. Testing ======= diff -r 4c2bd990d28a -r 25bd6515fed0 Makefile.am --- a/Makefile.am Mon Aug 15 05:37:57 2016 +0100 +++ b/Makefile.am Mon Aug 15 06:04:49 2016 +0100 @@ -860,8 +860,6 @@ ANT_RESPECT_JAVA_HOME="TRUE" \ DISTRIBUTION_ID="$(DIST_ID)" \ DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ - DEBUG_CLASSFILES="true" \ - DEBUG_BINARIES="true" \ VERBOSE="$(VERBOSE)" \ ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \ STATIC_CXX="false" \ @@ -959,6 +957,16 @@ COMPRESS_JARS="true" endif +if ENABLE_NATIVE_DEBUGINFO +ICEDTEA_ENV += \ + DEBUG_BINARIES="true" +endif + +if ENABLE_JAVA_DEBUGINFO +ICEDTEA_ENV += \ + DEBUG_CLASSFILES="true" +endif + # OpenJDK ecj build environment. ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \ ALT_OUTPUTDIR="$(ECJ_BUILD_OUTPUT_DIR)" \ diff -r 4c2bd990d28a -r 25bd6515fed0 NEWS --- a/NEWS Mon Aug 15 05:37:57 2016 +0100 +++ b/NEWS Mon Aug 15 06:04:49 2016 +0100 @@ -14,6 +14,10 @@ New in release 1.14.0 (201X-XX-XX): +* New features + - PR1372: Provide option to build without debugging + - PR2083: Add support for building Zero on AArch64 + - PR3112: Provide option to disable SystemTap tests * Backports - S2178143, PR2959: JVM crashes if the number of bound CPUs changed during runtime - S6260348, PR3068: GTK+ L&F JTextComponent not respecting desktop caret blink rate @@ -29,7 +33,6 @@ - S8076221, PR2808: Disable RC4 cipher suites * Bug fixes - PR1886: IcedTea does not checksum supplied tarballs - - PR2083: Add support for building Zero on AArch64 - PR2800: Files are missing from resources.jar - PR2849: wget not required when downloading is disabled - PR2954: ecj/override.patch is missing new @Overrides in RMIJRMPServerImpl.java @@ -38,7 +41,6 @@ - PR2962: System default check doesn't match all GNU/Linux systems - PR2969: ENABLE_SYSTEM_LCMS is not defined if ENABLE_LCMS2 is not set - PR3092: SystemTap is heavily confused by multiple JDKs - - PR3112: Provide option to disable SystemTap tests - PR3137: GTKLookAndFeel does not honor gtk-alternative-button-order - PR3139: Update documentation diff -r 4c2bd990d28a -r 25bd6515fed0 acinclude.m4 --- a/acinclude.m4 Mon Aug 15 05:37:57 2016 +0100 +++ b/acinclude.m4 Mon Aug 15 06:04:49 2016 +0100 @@ -1311,6 +1311,50 @@ AC_PROVIDE([$0])dnl ]) +AC_DEFUN_ONCE([IT_ENABLE_NATIVE_DEBUGINFO], +[ + AC_MSG_CHECKING([whether to build native code with debugging information]) + AC_ARG_ENABLE([native-debuginfo], + [AS_HELP_STRING(--enable-native-debuginfo,build with native code debuginfo [[default=yes]])], + [ + case "${enableval}" in + yes) + enable_native_debuginfo=yes + ;; + *) + enable_native_debuginfo=no + ;; + esac + ], + [ + enable_native_debuginfo=yes + ]) + AC_MSG_RESULT([$enable_native_debuginfo]) + AM_CONDITIONAL([ENABLE_NATIVE_DEBUGINFO], test x"${enable_native_debuginfo}" = "xyes") +]) + +AC_DEFUN_ONCE([IT_ENABLE_JAVA_DEBUGINFO], +[ + AC_MSG_CHECKING([whether to build Java bytecode with debugging information]) + AC_ARG_ENABLE([java-debuginfo], + [AS_HELP_STRING(--enable-java-debuginfo,build with Java bytecode debuginfo [[default=yes]])], + [ + case "${enableval}" in + yes) + enable_java_debuginfo=yes + ;; + *) + enable_java_debuginfo=no + ;; + esac + ], + [ + enable_java_debuginfo=yes + ]) + AC_MSG_RESULT([$enable_java_debuginfo]) + AM_CONDITIONAL([ENABLE_JAVA_DEBUGINFO], test x"${enable_java_debuginfo}" = "xyes") +]) + AC_DEFUN_ONCE([IT_HAS_NATIVE_HOTSPOT_PORT], [ AC_MSG_CHECKING([if a native HotSpot port is available for this architecture]) diff -r 4c2bd990d28a -r 25bd6515fed0 configure.ac --- a/configure.ac Mon Aug 15 05:37:57 2016 +0100 +++ b/configure.ac Mon Aug 15 06:04:49 2016 +0100 @@ -64,6 +64,8 @@ IT_DISABLE_LANGTOOLS_TESTS IT_DISABLE_JDK_TESTS IT_DISABLE_SYSTEMTAP_TESTS +IT_ENABLE_NATIVE_DEBUGINFO +IT_ENABLE_JAVA_DEBUGINFO IT_WITH_FONTS_DIR AC_CONFIG_FILES([linux.fontconfig.Gentoo.properties])