Mercurial > hg > icedtea8-forest
changeset 2542:f0482b9b7f7b icedtea-3.12.0
Merge jdk8u212-b04
author | andrew |
---|---|
date | Thu, 18 Apr 2019 03:46:13 +0100 |
parents | be0c5a93c2a9 (current diff) c52bf8887eb0 (diff) |
children | 4dc1bb699b99 |
files | .hgtags common/autoconf/flags.m4 common/autoconf/generated-configure.sh common/autoconf/help.m4 common/autoconf/jdk-options.m4 common/autoconf/libraries.m4 common/autoconf/spec.gmk.in make/common/NativeCompilation.gmk |
diffstat | 10 files changed, 390 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Apr 17 03:47:22 2019 +0100 +++ b/.hgtags Thu Apr 18 03:46:13 2019 +0100 @@ -988,6 +988,11 @@ 97ecc454983b0f4bcde98ade9b1b6c2afe4f1dd6 jdk8u201-b77 4b734c44eee9ca06bf1b0078aab8e0d248b10ad4 jdk8u201-b08 9edccdd36f81617d9e7754b7c89cdf542113b73d icedtea-3.11.0 +9250f69171139724ac2887ba6ba258d710d604d3 jdk8u201-b09 +f12674350119c3608e21a4d047333d9b4601e9d4 jdk8u201-b79 +7c2db1a58ed1b23ea065eef214fb438a98814b5e jdk8u201-b25 +52cda73a68eb5b415994dc5ff59ca1d18dfd2283 jdk8u201-b26 +9250f69171139724ac2887ba6ba258d710d604d3 jdk8u201-ga dc92f24722a6ae95aa4d71b80478ef4ada047c02 jdk8u202-b01 1c0d5a15ab4c9dcea8aed752ecdfe159ed8f3e29 jdk8u202-b02 cfa6347c891bc34c27901db9f368ce977ab3c714 jdk8u202-b03 @@ -997,3 +1002,13 @@ 3be6b6bece51fdfa8c76220a7f60f157938659c7 jdk8u202-b07 4f847be0b2d7d22459e8d84c9123b2d4ee05789f icedtea-3.12.0pre01 9edccdd36f81617d9e7754b7c89cdf542113b73d icedtea-3.12.0pre00 +0ea872ce75502739f90bacf092d471889673c757 jdk8u202-b08 +d194c1e53bdb78a6d546263de88a7a0c939f45ba jdk8u202-b25 +a8b6e38ee409be0fb8fc931a4762f9d04f2f2da0 jdk8u202-b26 +0ea872ce75502739f90bacf092d471889673c757 jdk8u202-ga +3a2209a0e9c9192bc803a95fa72510a79847bf15 jdk8u212-b00 +5af73acc6b6c7097ce916c860fd85c45459ea19a jdk8u212-b01 +7480582c7fdcfc86b5541a1887289a8416ef7f7d jdk8u212-b02 +5218ef8ea6c355b5f3294a21675dfb6d372c02f4 jdk8u212-b03 +d43cf567cf721406472abc52d12980a25b886577 jdk8u212-b04 +5218ef8ea6c355b5f3294a21675dfb6d372c02f4 jdk8u212-ga
--- a/THIRD_PARTY_README Wed Apr 17 03:47:22 2019 +0100 +++ b/THIRD_PARTY_README Thu Apr 18 03:46:13 2019 +0100 @@ -1096,33 +1096,6 @@ OF SUCH DAMAGE. --- end of LICENSE --- -%% This notice is provided with respect to FontConfig 2.5, which may be -included with JRE 8, JDK 8, and OpenJDK 8 source distributions on -Linux and Solaris. - ---- begin of LICENSE --- - -Copyright ?? 2001,2003 Keith Packard - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that the -above copyright notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting documentation, and that -the name of Keith Packard not be used in advertising or publicity pertaining -to distribution of the software without specific, written prior permission. -Keith Packard makes no representations about the suitability of this software -for any purpose. It is provided "as is" without express or implied warranty. - -KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL KEITH -PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY -DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - ---- end of LICENSE --- - ------------------------------------------------------------------------------- %% This notice is provided with respect to freebXML Registry 3.0 & 3.1,
--- a/common/autoconf/configure.ac Wed Apr 17 03:47:22 2019 +0100 +++ b/common/autoconf/configure.ac Thu Apr 18 03:46:13 2019 +0100 @@ -210,6 +210,7 @@ LIB_SETUP_CUPS LIB_SETUP_FREETYPE LIB_SETUP_ALSA +LIB_SETUP_FONTCONFIG LIB_SETUP_MISC_LIBS LIB_SETUP_STATIC_LINK_LIBSTDCPP LIB_SETUP_ON_WINDOWS
--- a/common/autoconf/flags.m4 Wed Apr 17 03:47:22 2019 +0100 +++ b/common/autoconf/flags.m4 Thu Apr 18 03:46:13 2019 +0100 @@ -111,7 +111,7 @@ -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \ -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \ -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \ - -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\"" + -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\"" fi AC_SUBST(RC_FLAGS)
--- a/common/autoconf/generated-configure.sh Wed Apr 17 03:47:22 2019 +0100 +++ b/common/autoconf/generated-configure.sh Thu Apr 18 03:46:13 2019 +0100 @@ -662,7 +662,6 @@ KRB5_CFLAGS IMPROVED_FONT_RENDERING_SUPPORT FONTCONFIG_LIBS -FONTCONFIG_CFLAGS LIBDL LIBM LIBZIP_CAN_USE_MMAP @@ -675,6 +674,7 @@ LCMS_CFLAGS USE_EXTERNAL_LIBGIF USE_EXTERNAL_LIBJPEG +FONTCONFIG_CFLAGS ALSA_LIBS ALSA_CFLAGS FREETYPE_BUNDLE_LIB_PATH @@ -847,9 +847,12 @@ COOKED_JDK_UPDATE_VERSION JDK_VERSION COPYRIGHT_YEAR +VENDOR_URL_VM_BUG +VENDOR_URL_BUG +VENDOR_URL +COMPANY_NAME MACOSX_BUNDLE_ID_BASE MACOSX_BUNDLE_NAME_BASE -COMPANY_NAME JDK_RC_PLATFORM_NAME PRODUCT_SUFFIX PRODUCT_NAME @@ -1081,6 +1084,10 @@ with_update_version with_user_release_suffix with_build_number +with_vendor_name +with_vendor_url +with_vendor_bug_url +with_vendor_vm_bug_url with_copyright_year with_boot_jdk with_alt_jar @@ -1118,6 +1125,8 @@ with_alsa with_alsa_include with_alsa_lib +with_fontconfig +with_fontconfig_include with_libjpeg with_giflib with_lcms @@ -1946,6 +1955,16 @@ Add a custom string to the version string if build number isn't set.[username_builddateb00] --with-build-number Set build number value for build [b00] + --with-vendor-name Set vendor name. Among others, used to set the + 'java.vendor' and 'java.vm.vendor' system + properties. [not specified] + --with-vendor-url Set the 'java.vendor.url' system property [not + specified] + --with-vendor-bug-url Set the 'java.vendor.url.bug' system property [not + specified] + --with-vendor-vm-bug-url + Sets the bug URL which will be displayed when the VM + crashes [not specified] --with-copyright-year Set copyright year value for build [current year] --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed] --with-alt-jar=PATH specify the location of an alternate jar binary to @@ -2007,6 +2026,10 @@ headers under PATH/include) --with-alsa-include specify directory for the alsa include files --with-alsa-lib specify directory for the alsa library + --with-fontconfig specify prefix directory for the fontconfig package + (expecting the headers under PATH/include) + --with-fontconfig-include + specify directory for the fontconfig include files --with-libjpeg use libjpeg from build system or OpenJDK source (system, bundled) [bundled] --with-giflib use giflib from build system or OpenJDK source @@ -3909,6 +3932,8 @@ PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;; cups) PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;; + fontconfig) + PKGHANDLER_COMMAND="sudo apt-get install libfontconfig1-dev" ;; freetype) PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;; pulse) @@ -3930,6 +3955,8 @@ PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;; cups) PKGHANDLER_COMMAND="sudo yum install cups-devel" ;; + fontconfig) + PKGHANDLER_COMMAND="sudo yum install fontconfig-devel" ;; freetype) PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;; pulse) @@ -3962,7 +3989,7 @@ # -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -4064,6 +4091,11 @@ +################################################################################ +# Setup fontconfig +################################################################################ + + @@ -4423,7 +4455,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1554129970 +DATE_WHEN_GENERATED=1555470411 ############################################################################### # @@ -19987,6 +20019,71 @@ + # The vendor name, if any + +# Check whether --with-vendor-name was given. +if test "${with_vendor_name+set}" = set; then : + withval=$with_vendor_name; +fi + + if test "x$with_vendor_name" = xyes; then + as_fn_error $? "--with-vendor-name must have a value" "$LINENO" 5 + elif ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ; then + as_fn_error $? "--with-vendor-name contains non-printing characters: $with_vendor_name" "$LINENO" 5 + elif test "x$with_vendor_name" != x; then + # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty. + # Otherwise we will use the value from "version-numbers" included above. + COMPANY_NAME="$with_vendor_name" + fi + + + # The vendor URL, if any + +# Check whether --with-vendor-url was given. +if test "${with_vendor_url+set}" = set; then : + withval=$with_vendor_url; +fi + + if test "x$with_vendor_url" = xyes; then + as_fn_error $? "--with-vendor-url must have a value" "$LINENO" 5 + elif ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ; then + as_fn_error $? "--with-vendor-url contains non-printing characters: $with_vendor_url" "$LINENO" 5 + else + VENDOR_URL="$with_vendor_url" + fi + + + # The vendor bug URL, if any + +# Check whether --with-vendor-bug-url was given. +if test "${with_vendor_bug_url+set}" = set; then : + withval=$with_vendor_bug_url; +fi + + if test "x$with_vendor_bug_url" = xyes; then + as_fn_error $? "--with-vendor-bug-url must have a value" "$LINENO" 5 + elif ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ; then + as_fn_error $? "--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url" "$LINENO" 5 + else + VENDOR_URL_BUG="$with_vendor_bug_url" + fi + + + # The vendor VM bug URL, if any + +# Check whether --with-vendor-vm-bug-url was given. +if test "${with_vendor_vm_bug_url+set}" = set; then : + withval=$with_vendor_vm_bug_url; +fi + + if test "x$with_vendor_vm_bug_url" = xyes; then + as_fn_error $? "--with-vendor-vm-bug-url must have a value" "$LINENO" 5 + elif ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ; then + as_fn_error $? "--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url" "$LINENO" 5 + else + VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url" + fi + # Check whether --with-copyright-year was given. @@ -40701,7 +40798,7 @@ -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \ -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \ -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \ - -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\"" + -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\"" fi @@ -42810,6 +42907,7 @@ ALSA_NOT_NEEDED=yes PULSE_NOT_NEEDED=yes X11_NOT_NEEDED=yes + FONTCONFIG_NOT_NEEDED=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa cups pulse x11" >&5 $as_echo "alsa cups pulse x11" >&6; } fi @@ -42820,6 +42918,7 @@ ALSA_NOT_NEEDED=yes PULSE_NOT_NEEDED=yes X11_NOT_NEEDED=yes + FONTCONFIG_NOT_NEEDED=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5 $as_echo "alsa pulse x11" >&6; } fi @@ -48138,6 +48237,114 @@ +# Check whether --with-fontconfig was given. +if test "${with_fontconfig+set}" = set; then : + withval=$with_fontconfig; +fi + + +# Check whether --with-fontconfig-include was given. +if test "${with_fontconfig_include+set}" = set; then : + withval=$with_fontconfig_include; +fi + + + if test "x$FONTCONFIG_NOT_NEEDED" = xyes; then + if (test "x${with_fontconfig}" != x && test "x${with_fontconfig}" != xno) || \ + (test "x${with_fontconfig_include}" != x && test "x${with_fontconfig_include}" != xno); then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fontconfig not used, so --with-fontconfig[-*] is ignored" >&5 +$as_echo "$as_me: WARNING: fontconfig not used, so --with-fontconfig[-*] is ignored" >&2;} + fi + FONTCONFIG_CFLAGS= + else + FONTCONFIG_FOUND=no + + if test "x${with_fontconfig}" = xno || test "x${with_fontconfig_include}" = xno; then + as_fn_error $? "It is not possible to disable the use of fontconfig. Remove the --without-fontconfig option." "$LINENO" 5 + fi + + if test "x${with_fontconfig}" != x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig headers" >&5 +$as_echo_n "checking for fontconfig headers... " >&6; } + if test -s "${with_fontconfig}/include/fontconfig/fontconfig.h"; then + FONTCONFIG_CFLAGS="-I${with_fontconfig}/include" + FONTCONFIG_FOUND=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTCONFIG_FOUND" >&5 +$as_echo "$FONTCONFIG_FOUND" >&6; } + else + as_fn_error $? "Can't find 'include/fontconfig/fontconfig.h' under ${with_fontconfig} given with the --with-fontconfig option." "$LINENO" 5 + fi + fi + if test "x${with_fontconfig_include}" != x; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig headers" >&5 +$as_echo_n "checking for fontconfig headers... " >&6; } + if test -s "${with_fontconfig_include}/fontconfig/fontconfig.h"; then + FONTCONFIG_CFLAGS="-I${with_fontconfig_include}" + FONTCONFIG_FOUND=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTCONFIG_FOUND" >&5 +$as_echo "$FONTCONFIG_FOUND" >&6; } + else + as_fn_error $? "Can't find 'fontconfig/fontconfig.h' under ${with_fontconfig_include} given with the --with-fontconfig-include option." "$LINENO" 5 + fi + fi + if test "x$FONTCONFIG_FOUND" = xno; then + # Are the fontconfig headers installed in the default /usr/include location? + for ac_header in fontconfig/fontconfig.h +do : + ac_fn_cxx_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default" +if test "x$ac_cv_header_fontconfig_fontconfig_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FONTCONFIG_FONTCONFIG_H 1 +_ACEOF + + FONTCONFIG_FOUND=yes + FONTCONFIG_CFLAGS= + DEFAULT_FONTCONFIG=yes + +fi + +done + + fi + if test "x$FONTCONFIG_FOUND" = xno; then + + # Print a helpful message on how to acquire the necessary build dependency. + # fontconfig is the help tag: freetype, cups, pulse, alsa etc + MISSING_DEPENDENCY=fontconfig + + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then + cygwin_help $MISSING_DEPENDENCY + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then + msys_help $MISSING_DEPENDENCY + else + PKGHANDLER_COMMAND= + + case $PKGHANDLER in + apt-get) + apt_help $MISSING_DEPENDENCY ;; + yum) + yum_help $MISSING_DEPENDENCY ;; + port) + port_help $MISSING_DEPENDENCY ;; + pkgutil) + pkgutil_help $MISSING_DEPENDENCY ;; + pkgadd) + pkgadd_help $MISSING_DEPENDENCY ;; + esac + + if test "x$PKGHANDLER_COMMAND" != x; then + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." + fi + fi + + as_fn_error $? "Could not find fontconfig! $HELP_MSG " "$LINENO" 5 + fi + fi + + + + + ############################################################################### # # Check for the jpeg library
--- a/common/autoconf/help.m4 Wed Apr 17 03:47:22 2019 +0100 +++ b/common/autoconf/help.m4 Thu Apr 18 03:46:13 2019 +0100 @@ -105,6 +105,8 @@ PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;; cups) PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;; + fontconfig) + PKGHANDLER_COMMAND="sudo apt-get install libfontconfig1-dev" ;; freetype) PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;; pulse) @@ -126,6 +128,8 @@ PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;; cups) PKGHANDLER_COMMAND="sudo yum install cups-devel" ;; + fontconfig) + PKGHANDLER_COMMAND="sudo yum install fontconfig-devel" ;; freetype) PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;; pulse)
--- a/common/autoconf/jdk-options.m4 Wed Apr 17 03:47:22 2019 +0100 +++ b/common/autoconf/jdk-options.m4 Thu Apr 18 03:46:13 2019 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -535,10 +535,60 @@ AC_SUBST(PRODUCT_NAME) AC_SUBST(PRODUCT_SUFFIX) AC_SUBST(JDK_RC_PLATFORM_NAME) - AC_SUBST(COMPANY_NAME) AC_SUBST(MACOSX_BUNDLE_NAME_BASE) AC_SUBST(MACOSX_BUNDLE_ID_BASE) + # The vendor name, if any + AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name], + [Set vendor name. Among others, used to set the 'java.vendor' + and 'java.vm.vendor' system properties. @<:@not specified@:>@])]) + if test "x$with_vendor_name" = xyes; then + AC_MSG_ERROR([--with-vendor-name must have a value]) + elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then + AC_MSG_ERROR([--with-vendor-name contains non-printing characters: $with_vendor_name]) + elif test "x$with_vendor_name" != x; then + # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty. + # Otherwise we will use the value from "version-numbers" included above. + COMPANY_NAME="$with_vendor_name" + fi + AC_SUBST(COMPANY_NAME) + + # The vendor URL, if any + AC_ARG_WITH(vendor-url, [AS_HELP_STRING([--with-vendor-url], + [Set the 'java.vendor.url' system property @<:@not specified@:>@])]) + if test "x$with_vendor_url" = xyes; then + AC_MSG_ERROR([--with-vendor-url must have a value]) + elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then + AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url]) + else + VENDOR_URL="$with_vendor_url" + fi + AC_SUBST(VENDOR_URL) + + # The vendor bug URL, if any + AC_ARG_WITH(vendor-bug-url, [AS_HELP_STRING([--with-vendor-bug-url], + [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])]) + if test "x$with_vendor_bug_url" = xyes; then + AC_MSG_ERROR([--with-vendor-bug-url must have a value]) + elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then + AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url]) + else + VENDOR_URL_BUG="$with_vendor_bug_url" + fi + AC_SUBST(VENDOR_URL_BUG) + + # The vendor VM bug URL, if any + AC_ARG_WITH(vendor-vm-bug-url, [AS_HELP_STRING([--with-vendor-vm-bug-url], + [Sets the bug URL which will be displayed when the VM crashes @<:@not specified@:>@])]) + if test "x$with_vendor_vm_bug_url" = xyes; then + AC_MSG_ERROR([--with-vendor-vm-bug-url must have a value]) + elif [ ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ]; then + AC_MSG_ERROR([--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url]) + else + VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url" + fi + AC_SUBST(VENDOR_URL_VM_BUG) + AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year], [Set copyright year value for build @<:@current year@:>@])]) if test "x$with_copyright_year" = xyes; then
--- a/common/autoconf/libraries.m4 Wed Apr 17 03:47:22 2019 +0100 +++ b/common/autoconf/libraries.m4 Thu Apr 18 03:46:13 2019 +0100 @@ -57,6 +57,7 @@ ALSA_NOT_NEEDED=yes PULSE_NOT_NEEDED=yes X11_NOT_NEEDED=yes + FONTCONFIG_NOT_NEEDED=yes AC_MSG_RESULT([alsa cups pulse x11]) fi @@ -65,6 +66,7 @@ ALSA_NOT_NEEDED=yes PULSE_NOT_NEEDED=yes X11_NOT_NEEDED=yes + FONTCONFIG_NOT_NEEDED=yes AC_MSG_RESULT([alsa pulse x11]) fi @@ -703,6 +705,67 @@ AC_SUBST(ALSA_LIBS) ]) +################################################################################ +# Setup fontconfig +################################################################################ +AC_DEFUN_ONCE([LIB_SETUP_FONTCONFIG], +[ + AC_ARG_WITH(fontconfig, [AS_HELP_STRING([--with-fontconfig], + [specify prefix directory for the fontconfig package + (expecting the headers under PATH/include)])]) + AC_ARG_WITH(fontconfig-include, [AS_HELP_STRING([--with-fontconfig-include], + [specify directory for the fontconfig include files])]) + + if test "x$FONTCONFIG_NOT_NEEDED" = xyes; then + if (test "x${with_fontconfig}" != x && test "x${with_fontconfig}" != xno) || \ + (test "x${with_fontconfig_include}" != x && test "x${with_fontconfig_include}" != xno); then + AC_MSG_WARN([[fontconfig not used, so --with-fontconfig[-*] is ignored]]) + fi + FONTCONFIG_CFLAGS= + else + FONTCONFIG_FOUND=no + + if test "x${with_fontconfig}" = xno || test "x${with_fontconfig_include}" = xno; then + AC_MSG_ERROR([It is not possible to disable the use of fontconfig. Remove the --without-fontconfig option.]) + fi + + if test "x${with_fontconfig}" != x; then + AC_MSG_CHECKING([for fontconfig headers]) + if test -s "${with_fontconfig}/include/fontconfig/fontconfig.h"; then + FONTCONFIG_CFLAGS="-I${with_fontconfig}/include" + FONTCONFIG_FOUND=yes + AC_MSG_RESULT([$FONTCONFIG_FOUND]) + else + AC_MSG_ERROR([Can't find 'include/fontconfig/fontconfig.h' under ${with_fontconfig} given with the --with-fontconfig option.]) + fi + fi + if test "x${with_fontconfig_include}" != x; then + AC_MSG_CHECKING([for fontconfig headers]) + if test -s "${with_fontconfig_include}/fontconfig/fontconfig.h"; then + FONTCONFIG_CFLAGS="-I${with_fontconfig_include}" + FONTCONFIG_FOUND=yes + AC_MSG_RESULT([$FONTCONFIG_FOUND]) + else + AC_MSG_ERROR([Can't find 'fontconfig/fontconfig.h' under ${with_fontconfig_include} given with the --with-fontconfig-include option.]) + fi + fi + if test "x$FONTCONFIG_FOUND" = xno; then + # Are the fontconfig headers installed in the default /usr/include location? + AC_CHECK_HEADERS([fontconfig/fontconfig.h], [ + FONTCONFIG_FOUND=yes + FONTCONFIG_CFLAGS= + DEFAULT_FONTCONFIG=yes + ]) + fi + if test "x$FONTCONFIG_FOUND" = xno; then + HELP_MSG_MISSING_DEPENDENCY([fontconfig]) + AC_MSG_ERROR([Could not find fontconfig! $HELP_MSG ]) + fi + fi + + AC_SUBST(FONTCONFIG_CFLAGS) +]) + AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], [
--- a/common/autoconf/spec.gmk.in Wed Apr 17 03:47:22 2019 +0100 +++ b/common/autoconf/spec.gmk.in Thu Apr 18 03:46:13 2019 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -150,6 +150,18 @@ NASHORN_TOPDIR:=@NASHORN_TOPDIR@ COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@ +# Platform naming variables +LAUNCHER_NAME:=@LAUNCHER_NAME@ +PRODUCT_NAME:=@PRODUCT_NAME@ +PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@ +JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@ +COMPANY_NAME:=@COMPANY_NAME@ +MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@ +MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@ +VENDOR_URL:=@VENDOR_URL@ +VENDOR_URL_BUG:=@VENDOR_URL_BUG@ +VENDOR_URL_VM_BUG:=@VENDOR_URL_VM_BUG@ + # Location where build customization files may be found CUSTOM_MAKE_DIR:=@CUSTOM_MAKE_DIR@ @@ -160,15 +172,33 @@ JDK_UPDATE_VERSION:=@JDK_UPDATE_VERSION@ JDK_BUILD_NUMBER:=@JDK_BUILD_NUMBER@ MILESTONE:=@MILESTONE@ -LAUNCHER_NAME:=@LAUNCHER_NAME@ -PRODUCT_NAME:=@PRODUCT_NAME@ -PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@ -JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@ -COMPANY_NAME:=@COMPANY_NAME@ -MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@ -MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@ USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@ +ifneq ($(COMPANY_NAME),) + # COMPANY_NAME is set to "N/A" in $AUTOCONF_DIR/version-numbers by default, + # but can be customized with the '--with-vendor-name' configure option. + # Only export "VENDOR" to the build if COMPANY_NAME contains a real value. + # Otherwise the default value for VENDOR, which is used to set the "java.vendor" + # and "java.vm.vendor" properties is hard-coded into the source code (i.e. in + # System.c in the jdk for "vm.vendor" and vm_version.cpp in the VM for "java.vm.vendor") + ifneq ($(COMPANY_NAME), N/A) + VERSION_CFLAGS += -DVENDOR='"$(COMPANY_NAME)"' + endif +endif + +# Only export VENDOR_URL, VENDOR_URL_BUG and VENDOR_VM_URL_BUG to the build if +# they are not empty. Otherwise, default values which are defined in the sources +# will be used. +ifneq ($(VENDOR_URL),) + VERSION_CFLAGS += -DVENDOR_URL='"$(VENDOR_URL)"' +endif +ifneq ($(VENDOR_URL_BUG),) + VERSION_CFLAGS += -DVENDOR_URL_BUG='"$(VENDOR_URL_BUG)"' +endif +ifneq ($(VENDOR_URL_VM_BUG),) + VERSION_CFLAGS += -DVENDOR_URL_VM_BUG='"$(VENDOR_URL_VM_BUG)"' +endif + # Different version strings generated from the above information. JDK_VERSION:=@JDK_VERSION@ RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)
--- a/make/common/NativeCompilation.gmk Wed Apr 17 03:47:22 2019 +0100 +++ b/make/common/NativeCompilation.gmk Thu Apr 18 03:46:13 2019 +0100 @@ -526,6 +526,7 @@ ifeq ($(ZIP_DEBUGINFO_FILES), true) ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet +ifneq ($$($1_STRIP_POLICY), no_strip) $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz ifeq ($(OPENJDK_TARGET_OS), windows) @@ -538,6 +539,7 @@ $(CD) $$($1_OBJECT_DIR) \ && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo endif +endif # not possible when stripping is disabled endif # no MacOS X support yet else ifeq ($(OPENJDK_TARGET_OS), windows) @@ -622,6 +624,7 @@ ifeq ($(ZIP_DEBUGINFO_FILES), true) ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet +ifneq ($$($1_STRIP_POLICY), no_strip) $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz ifeq ($(OPENJDK_TARGET_OS), windows) @@ -634,6 +637,7 @@ $(CD) $$($1_OBJECT_DIR) \ && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo endif +endif endif # no MacOS X support yet else ifeq ($(OPENJDK_TARGET_OS), windows)