Merge mips64el-jdk8u212-b04

Wed, 03 Jul 2019 20:37:44 +0800

author
aoqi
date
Wed, 03 Jul 2019 20:37:44 +0800
changeset 2408
2e38e8d106de
parent 2387
82b67bda24df
parent 2407
5218ef8ea6c3
child 2409
a80c7c028b1c

Merge

.hgtags file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
common/autoconf/configure.ac file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/help.m4 file | annotate | diff | comparison | revisions
common/autoconf/jdk-options.m4 file | annotate | diff | comparison | revisions
common/autoconf/libraries.m4 file | annotate | diff | comparison | revisions
common/autoconf/spec.gmk.in file | annotate | diff | comparison | revisions
make/common/NativeCompilation.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Jul 03 20:04:13 2019 +0800
     1.2 +++ b/.hgtags	Wed Jul 03 20:37:44 2019 +0800
     1.3 @@ -948,6 +948,11 @@
     1.4  fb2d87afd9f84753f1b4c052737823e1003a82bc jdk8u201-b07
     1.5  97ecc454983b0f4bcde98ade9b1b6c2afe4f1dd6 jdk8u201-b77
     1.6  4b734c44eee9ca06bf1b0078aab8e0d248b10ad4 jdk8u201-b08
     1.7 +9250f69171139724ac2887ba6ba258d710d604d3 jdk8u201-b09
     1.8 +f12674350119c3608e21a4d047333d9b4601e9d4 jdk8u201-b79
     1.9 +7c2db1a58ed1b23ea065eef214fb438a98814b5e jdk8u201-b25
    1.10 +52cda73a68eb5b415994dc5ff59ca1d18dfd2283 jdk8u201-b26
    1.11 +9250f69171139724ac2887ba6ba258d710d604d3 jdk8u201-ga
    1.12  dc92f24722a6ae95aa4d71b80478ef4ada047c02 jdk8u202-b01
    1.13  1c0d5a15ab4c9dcea8aed752ecdfe159ed8f3e29 jdk8u202-b02
    1.14  cfa6347c891bc34c27901db9f368ce977ab3c714 jdk8u202-b03
    1.15 @@ -958,3 +963,9 @@
    1.16  0ea872ce75502739f90bacf092d471889673c757 jdk8u202-b08
    1.17  b45bf475c2caeb2cbac417f0e6425680742dfe8f mips64el-jdk8u202-b09
    1.18  859c1921982a3129a5f4373f9233ad4159e6ebfc mips64el-jdk8u202-b10
    1.19 +d194c1e53bdb78a6d546263de88a7a0c939f45ba jdk8u202-b25
    1.20 +a8b6e38ee409be0fb8fc931a4762f9d04f2f2da0 jdk8u202-b26
    1.21 +0ea872ce75502739f90bacf092d471889673c757 jdk8u202-ga
    1.22 +3a2209a0e9c9192bc803a95fa72510a79847bf15 jdk8u212-b00
    1.23 +5af73acc6b6c7097ce916c860fd85c45459ea19a jdk8u212-b01
    1.24 +7480582c7fdcfc86b5541a1887289a8416ef7f7d jdk8u212-b02
     2.1 --- a/THIRD_PARTY_README	Wed Jul 03 20:04:13 2019 +0800
     2.2 +++ b/THIRD_PARTY_README	Wed Jul 03 20:37:44 2019 +0800
     2.3 @@ -1096,33 +1096,6 @@
     2.4  OF SUCH DAMAGE.
     2.5  --- end of LICENSE ---
     2.6  
     2.7 -%% This notice is provided with respect to FontConfig 2.5, which may be 
     2.8 -included with JRE 8, JDK 8, and OpenJDK 8 source distributions on
     2.9 -Linux and Solaris.
    2.10 -
    2.11 ---- begin of LICENSE ---
    2.12 -
    2.13 -Copyright ?? 2001,2003 Keith Packard
    2.14 -
    2.15 -Permission to use, copy, modify, distribute, and sell this software and its
    2.16 -documentation for any purpose is hereby granted without fee, provided that the
    2.17 -above copyright notice appear in all copies and that both that copyright
    2.18 -notice and this permission notice appear in supporting documentation, and that
    2.19 -the name of Keith Packard not be used in advertising or publicity pertaining
    2.20 -to distribution of the software without specific, written prior permission.
    2.21 -Keith Packard makes no representations about the suitability of this software
    2.22 -for any purpose.  It is provided "as is" without express or implied warranty.
    2.23 -
    2.24 -KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
    2.25 -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL KEITH
    2.26 -PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
    2.27 -DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
    2.28 -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
    2.29 -CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
    2.30 -
    2.31 -
    2.32 ---- end of LICENSE ---
    2.33 -
    2.34  -------------------------------------------------------------------------------
    2.35  
    2.36  %% This notice is provided with respect to freebXML Registry 3.0 & 3.1,
     3.1 --- a/common/autoconf/configure.ac	Wed Jul 03 20:04:13 2019 +0800
     3.2 +++ b/common/autoconf/configure.ac	Wed Jul 03 20:37:44 2019 +0800
     3.3 @@ -217,6 +217,7 @@
     3.4  LIB_SETUP_CUPS
     3.5  LIB_SETUP_FREETYPE
     3.6  LIB_SETUP_ALSA
     3.7 +LIB_SETUP_FONTCONFIG
     3.8  LIB_SETUP_MISC_LIBS
     3.9  LIB_SETUP_STATIC_LINK_LIBSTDCPP
    3.10  LIB_SETUP_ON_WINDOWS
     4.1 --- a/common/autoconf/flags.m4	Wed Jul 03 20:04:13 2019 +0800
     4.2 +++ b/common/autoconf/flags.m4	Wed Jul 03 20:37:44 2019 +0800
     4.3 @@ -111,7 +111,7 @@
     4.4          -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
     4.5          -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
     4.6          -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
     4.7 -        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
     4.8 +        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
     4.9    fi
    4.10    AC_SUBST(RC_FLAGS)
    4.11  
     5.1 --- a/common/autoconf/generated-configure.sh	Wed Jul 03 20:04:13 2019 +0800
     5.2 +++ b/common/autoconf/generated-configure.sh	Wed Jul 03 20:37:44 2019 +0800
     5.3 @@ -657,6 +657,7 @@
     5.4  USE_EXTERNAL_LIBZ
     5.5  USE_EXTERNAL_LIBGIF
     5.6  USE_EXTERNAL_LIBJPEG
     5.7 +FONTCONFIG_CFLAGS
     5.8  ALSA_LIBS
     5.9  ALSA_CFLAGS
    5.10  FREETYPE_BUNDLE_LIB_PATH
    5.11 @@ -827,9 +828,12 @@
    5.12  COOKED_JDK_UPDATE_VERSION
    5.13  JDK_VERSION
    5.14  COPYRIGHT_YEAR
    5.15 +VENDOR_URL_VM_BUG
    5.16 +VENDOR_URL_BUG
    5.17 +VENDOR_URL
    5.18 +COMPANY_NAME
    5.19  MACOSX_BUNDLE_ID_BASE
    5.20  MACOSX_BUNDLE_NAME_BASE
    5.21 -COMPANY_NAME
    5.22  JDK_RC_PLATFORM_NAME
    5.23  PRODUCT_SUFFIX
    5.24  PRODUCT_NAME
    5.25 @@ -1059,6 +1063,10 @@
    5.26  with_update_version
    5.27  with_user_release_suffix
    5.28  with_build_number
    5.29 +with_vendor_name
    5.30 +with_vendor_url
    5.31 +with_vendor_bug_url
    5.32 +with_vendor_vm_bug_url
    5.33  with_copyright_year
    5.34  with_boot_jdk
    5.35  with_boot_jdk_jvmargs
    5.36 @@ -1094,6 +1102,8 @@
    5.37  with_alsa
    5.38  with_alsa_include
    5.39  with_alsa_lib
    5.40 +with_fontconfig
    5.41 +with_fontconfig_include
    5.42  with_giflib
    5.43  with_zlib
    5.44  with_stdc__lib
    5.45 @@ -1890,6 +1900,16 @@
    5.46                            Add a custom string to the version string if build
    5.47                            number isn't set.[username_builddateb00]
    5.48    --with-build-number     Set build number value for build [b00]
    5.49 +  --with-vendor-name      Set vendor name. Among others, used to set the
    5.50 +                          'java.vendor' and 'java.vm.vendor' system
    5.51 +                          properties. [not specified]
    5.52 +  --with-vendor-url       Set the 'java.vendor.url' system property [not
    5.53 +                          specified]
    5.54 +  --with-vendor-bug-url   Set the 'java.vendor.url.bug' system property [not
    5.55 +                          specified]
    5.56 +  --with-vendor-vm-bug-url
    5.57 +                          Sets the bug URL which will be displayed when the VM
    5.58 +                          crashes [not specified]
    5.59    --with-copyright-year   Set copyright year value for build [current year]
    5.60    --with-boot-jdk         path to Boot JDK (used to bootstrap build) [probed]
    5.61    --with-boot-jdk-jvmargs specify JVM arguments to be passed to all
    5.62 @@ -1949,6 +1969,10 @@
    5.63                            headers under PATH/include)
    5.64    --with-alsa-include     specify directory for the alsa include files
    5.65    --with-alsa-lib         specify directory for the alsa library
    5.66 +  --with-fontconfig       specify prefix directory for the fontconfig package
    5.67 +                          (expecting the headers under PATH/include)
    5.68 +  --with-fontconfig-include
    5.69 +                          specify directory for the fontconfig include files
    5.70    --with-giflib           use giflib from build system or OpenJDK source
    5.71                            (system, bundled) [bundled]
    5.72    --with-zlib             use zlib from build system or OpenJDK source
    5.73 @@ -3830,6 +3854,8 @@
    5.74        PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
    5.75      cups)
    5.76        PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
    5.77 +    fontconfig)
    5.78 +      PKGHANDLER_COMMAND="sudo apt-get install libfontconfig1-dev" ;;
    5.79      freetype)
    5.80        PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
    5.81      pulse)
    5.82 @@ -3851,6 +3877,8 @@
    5.83        PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
    5.84      cups)
    5.85        PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
    5.86 +    fontconfig)
    5.87 +      PKGHANDLER_COMMAND="sudo yum install fontconfig-devel" ;;
    5.88      freetype)
    5.89        PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
    5.90      pulse)
    5.91 @@ -3985,6 +4013,11 @@
    5.92  
    5.93  
    5.94  
    5.95 +################################################################################
    5.96 +# Setup fontconfig
    5.97 +################################################################################
    5.98 +
    5.99 +
   5.100  
   5.101  
   5.102  
   5.103 @@ -4017,8 +4050,8 @@
   5.104  #
   5.105  
   5.106  #
   5.107 -# This file has been modified by Loongson Technology in 2018. These
   5.108 -# modifications are Copyright (c) 2018 Loongson Technology, and are made
   5.109 +# This file has been modified by Loongson Technology in 2019. These
   5.110 +# modifications are Copyright (c) 2018, 2019, Loongson Technology, and are made
   5.111  # available on the same license terms set forth above.
   5.112  #
   5.113  
   5.114 @@ -4064,8 +4097,6 @@
   5.115  
   5.116  
   5.117  
   5.118 -
   5.119 -
   5.120  #
   5.121  # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
   5.122  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   5.123 @@ -19889,6 +19920,71 @@
   5.124  
   5.125  
   5.126  
   5.127 +  # The vendor name, if any
   5.128 +
   5.129 +# Check whether --with-vendor-name was given.
   5.130 +if test "${with_vendor_name+set}" = set; then :
   5.131 +  withval=$with_vendor_name;
   5.132 +fi
   5.133 +
   5.134 +  if test "x$with_vendor_name" = xyes; then
   5.135 +    as_fn_error $? "--with-vendor-name must have a value" "$LINENO" 5
   5.136 +  elif  ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ; then
   5.137 +    as_fn_error $? "--with-vendor-name contains non-printing characters: $with_vendor_name" "$LINENO" 5
   5.138 +  elif test "x$with_vendor_name" != x; then
   5.139 +    # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty.
   5.140 +    # Otherwise we will use the value from "version-numbers" included above.
   5.141 +    COMPANY_NAME="$with_vendor_name"
   5.142 +  fi
   5.143 +
   5.144 +
   5.145 +  # The vendor URL, if any
   5.146 +
   5.147 +# Check whether --with-vendor-url was given.
   5.148 +if test "${with_vendor_url+set}" = set; then :
   5.149 +  withval=$with_vendor_url;
   5.150 +fi
   5.151 +
   5.152 +  if test "x$with_vendor_url" = xyes; then
   5.153 +    as_fn_error $? "--with-vendor-url must have a value" "$LINENO" 5
   5.154 +  elif  ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ; then
   5.155 +    as_fn_error $? "--with-vendor-url contains non-printing characters: $with_vendor_url" "$LINENO" 5
   5.156 +  else
   5.157 +    VENDOR_URL="$with_vendor_url"
   5.158 +  fi
   5.159 +
   5.160 +
   5.161 +  # The vendor bug URL, if any
   5.162 +
   5.163 +# Check whether --with-vendor-bug-url was given.
   5.164 +if test "${with_vendor_bug_url+set}" = set; then :
   5.165 +  withval=$with_vendor_bug_url;
   5.166 +fi
   5.167 +
   5.168 +  if test "x$with_vendor_bug_url" = xyes; then
   5.169 +    as_fn_error $? "--with-vendor-bug-url must have a value" "$LINENO" 5
   5.170 +  elif  ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ; then
   5.171 +    as_fn_error $? "--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url" "$LINENO" 5
   5.172 +  else
   5.173 +    VENDOR_URL_BUG="$with_vendor_bug_url"
   5.174 +  fi
   5.175 +
   5.176 +
   5.177 +  # The vendor VM bug URL, if any
   5.178 +
   5.179 +# Check whether --with-vendor-vm-bug-url was given.
   5.180 +if test "${with_vendor_vm_bug_url+set}" = set; then :
   5.181 +  withval=$with_vendor_vm_bug_url;
   5.182 +fi
   5.183 +
   5.184 +  if test "x$with_vendor_vm_bug_url" = xyes; then
   5.185 +    as_fn_error $? "--with-vendor-vm-bug-url must have a value" "$LINENO" 5
   5.186 +  elif  ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ; then
   5.187 +    as_fn_error $? "--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url" "$LINENO" 5
   5.188 +  else
   5.189 +    VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url"
   5.190 +  fi
   5.191 +
   5.192  
   5.193  
   5.194  # Check whether --with-copyright-year was given.
   5.195 @@ -40558,7 +40654,7 @@
   5.196          -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
   5.197          -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
   5.198          -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
   5.199 -        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
   5.200 +        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
   5.201    fi
   5.202  
   5.203  
   5.204 @@ -42470,6 +42566,7 @@
   5.205      ALSA_NOT_NEEDED=yes
   5.206      PULSE_NOT_NEEDED=yes
   5.207      X11_NOT_NEEDED=yes
   5.208 +    FONTCONFIG_NOT_NEEDED=yes
   5.209      { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa cups pulse x11" >&5
   5.210  $as_echo "alsa cups pulse x11" >&6; }
   5.211    fi
   5.212 @@ -42480,6 +42577,7 @@
   5.213      ALSA_NOT_NEEDED=yes
   5.214      PULSE_NOT_NEEDED=yes
   5.215      X11_NOT_NEEDED=yes
   5.216 +    FONTCONFIG_NOT_NEEDED=yes
   5.217      { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5
   5.218  $as_echo "alsa pulse x11" >&6; }
   5.219    fi
   5.220 @@ -47798,6 +47896,114 @@
   5.221  
   5.222  
   5.223  
   5.224 +# Check whether --with-fontconfig was given.
   5.225 +if test "${with_fontconfig+set}" = set; then :
   5.226 +  withval=$with_fontconfig;
   5.227 +fi
   5.228 +
   5.229 +
   5.230 +# Check whether --with-fontconfig-include was given.
   5.231 +if test "${with_fontconfig_include+set}" = set; then :
   5.232 +  withval=$with_fontconfig_include;
   5.233 +fi
   5.234 +
   5.235 +
   5.236 +  if test "x$FONTCONFIG_NOT_NEEDED" = xyes; then
   5.237 +    if (test "x${with_fontconfig}" != x && test "x${with_fontconfig}" != xno) || \
   5.238 +        (test "x${with_fontconfig_include}" != x && test "x${with_fontconfig_include}" != xno); then
   5.239 +      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fontconfig not used, so --with-fontconfig[-*] is ignored" >&5
   5.240 +$as_echo "$as_me: WARNING: fontconfig not used, so --with-fontconfig[-*] is ignored" >&2;}
   5.241 +    fi
   5.242 +    FONTCONFIG_CFLAGS=
   5.243 +  else
   5.244 +    FONTCONFIG_FOUND=no
   5.245 +
   5.246 +    if test "x${with_fontconfig}" = xno || test "x${with_fontconfig_include}" = xno; then
   5.247 +      as_fn_error $? "It is not possible to disable the use of fontconfig. Remove the --without-fontconfig option." "$LINENO" 5
   5.248 +    fi
   5.249 +
   5.250 +    if test "x${with_fontconfig}" != x; then
   5.251 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig headers" >&5
   5.252 +$as_echo_n "checking for fontconfig headers... " >&6; }
   5.253 +      if test -s "${with_fontconfig}/include/fontconfig/fontconfig.h"; then
   5.254 +        FONTCONFIG_CFLAGS="-I${with_fontconfig}/include"
   5.255 +        FONTCONFIG_FOUND=yes
   5.256 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTCONFIG_FOUND" >&5
   5.257 +$as_echo "$FONTCONFIG_FOUND" >&6; }
   5.258 +      else
   5.259 +        as_fn_error $? "Can't find 'include/fontconfig/fontconfig.h' under ${with_fontconfig} given with the --with-fontconfig option." "$LINENO" 5
   5.260 +      fi
   5.261 +    fi
   5.262 +    if test "x${with_fontconfig_include}" != x; then
   5.263 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig headers" >&5
   5.264 +$as_echo_n "checking for fontconfig headers... " >&6; }
   5.265 +      if test -s "${with_fontconfig_include}/fontconfig/fontconfig.h"; then
   5.266 +        FONTCONFIG_CFLAGS="-I${with_fontconfig_include}"
   5.267 +        FONTCONFIG_FOUND=yes
   5.268 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTCONFIG_FOUND" >&5
   5.269 +$as_echo "$FONTCONFIG_FOUND" >&6; }
   5.270 +      else
   5.271 +        as_fn_error $? "Can't find 'fontconfig/fontconfig.h' under ${with_fontconfig_include} given with the --with-fontconfig-include option." "$LINENO" 5
   5.272 +      fi
   5.273 +    fi
   5.274 +    if test "x$FONTCONFIG_FOUND" = xno; then
   5.275 +      # Are the fontconfig headers installed in the default /usr/include location?
   5.276 +      for ac_header in fontconfig/fontconfig.h
   5.277 +do :
   5.278 +  ac_fn_cxx_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
   5.279 +if test "x$ac_cv_header_fontconfig_fontconfig_h" = xyes; then :
   5.280 +  cat >>confdefs.h <<_ACEOF
   5.281 +#define HAVE_FONTCONFIG_FONTCONFIG_H 1
   5.282 +_ACEOF
   5.283 +
   5.284 +          FONTCONFIG_FOUND=yes
   5.285 +          FONTCONFIG_CFLAGS=
   5.286 +          DEFAULT_FONTCONFIG=yes
   5.287 +
   5.288 +fi
   5.289 +
   5.290 +done
   5.291 +
   5.292 +    fi
   5.293 +    if test "x$FONTCONFIG_FOUND" = xno; then
   5.294 +
   5.295 +  # Print a helpful message on how to acquire the necessary build dependency.
   5.296 +  # fontconfig is the help tag: freetype, cups, pulse, alsa etc
   5.297 +  MISSING_DEPENDENCY=fontconfig
   5.298 +
   5.299 +  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
   5.300 +    cygwin_help $MISSING_DEPENDENCY
   5.301 +  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
   5.302 +    msys_help $MISSING_DEPENDENCY
   5.303 +  else
   5.304 +    PKGHANDLER_COMMAND=
   5.305 +
   5.306 +    case $PKGHANDLER in
   5.307 +      apt-get)
   5.308 +        apt_help     $MISSING_DEPENDENCY ;;
   5.309 +      yum)
   5.310 +        yum_help     $MISSING_DEPENDENCY ;;
   5.311 +      port)
   5.312 +        port_help    $MISSING_DEPENDENCY ;;
   5.313 +      pkgutil)
   5.314 +        pkgutil_help $MISSING_DEPENDENCY ;;
   5.315 +      pkgadd)
   5.316 +        pkgadd_help  $MISSING_DEPENDENCY ;;
   5.317 +    esac
   5.318 +
   5.319 +    if test "x$PKGHANDLER_COMMAND" != x; then
   5.320 +      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
   5.321 +    fi
   5.322 +  fi
   5.323 +
   5.324 +      as_fn_error $? "Could not find fontconfig! $HELP_MSG " "$LINENO" 5
   5.325 +    fi
   5.326 +  fi
   5.327 +
   5.328 +
   5.329 +
   5.330 +
   5.331 +
   5.332    ###############################################################################
   5.333    #
   5.334    # Check for the jpeg library
     6.1 --- a/common/autoconf/help.m4	Wed Jul 03 20:04:13 2019 +0800
     6.2 +++ b/common/autoconf/help.m4	Wed Jul 03 20:37:44 2019 +0800
     6.3 @@ -105,6 +105,8 @@
     6.4        PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
     6.5      cups)
     6.6        PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
     6.7 +    fontconfig)
     6.8 +      PKGHANDLER_COMMAND="sudo apt-get install libfontconfig1-dev" ;;
     6.9      freetype)
    6.10        PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
    6.11      pulse)
    6.12 @@ -126,6 +128,8 @@
    6.13        PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
    6.14      cups)
    6.15        PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
    6.16 +    fontconfig)
    6.17 +      PKGHANDLER_COMMAND="sudo yum install fontconfig-devel" ;;
    6.18      freetype)
    6.19        PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
    6.20      pulse)
     7.1 --- a/common/autoconf/jdk-options.m4	Wed Jul 03 20:04:13 2019 +0800
     7.2 +++ b/common/autoconf/jdk-options.m4	Wed Jul 03 20:37:44 2019 +0800
     7.3 @@ -1,5 +1,5 @@
     7.4  #
     7.5 -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
     7.6 +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
     7.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.8  #
     7.9  # This code is free software; you can redistribute it and/or modify it
    7.10 @@ -509,10 +509,60 @@
    7.11    AC_SUBST(PRODUCT_NAME)
    7.12    AC_SUBST(PRODUCT_SUFFIX)
    7.13    AC_SUBST(JDK_RC_PLATFORM_NAME)
    7.14 -  AC_SUBST(COMPANY_NAME)
    7.15    AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
    7.16    AC_SUBST(MACOSX_BUNDLE_ID_BASE)
    7.17  
    7.18 +  # The vendor name, if any
    7.19 +  AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
    7.20 +      [Set vendor name. Among others, used to set the 'java.vendor'
    7.21 +       and 'java.vm.vendor' system properties. @<:@not specified@:>@])])
    7.22 +  if test "x$with_vendor_name" = xyes; then
    7.23 +    AC_MSG_ERROR([--with-vendor-name must have a value])
    7.24 +  elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then
    7.25 +    AC_MSG_ERROR([--with-vendor-name contains non-printing characters: $with_vendor_name])
    7.26 +  elif test "x$with_vendor_name" != x; then
    7.27 +    # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty.
    7.28 +    # Otherwise we will use the value from "version-numbers" included above.
    7.29 +    COMPANY_NAME="$with_vendor_name"
    7.30 +  fi
    7.31 +  AC_SUBST(COMPANY_NAME)
    7.32 +
    7.33 +  # The vendor URL, if any
    7.34 +  AC_ARG_WITH(vendor-url, [AS_HELP_STRING([--with-vendor-url],
    7.35 +      [Set the 'java.vendor.url' system property @<:@not specified@:>@])])
    7.36 +  if test "x$with_vendor_url" = xyes; then
    7.37 +    AC_MSG_ERROR([--with-vendor-url must have a value])
    7.38 +  elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then
    7.39 +    AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
    7.40 +  else
    7.41 +    VENDOR_URL="$with_vendor_url"
    7.42 +  fi
    7.43 +  AC_SUBST(VENDOR_URL)
    7.44 +
    7.45 +  # The vendor bug URL, if any
    7.46 +  AC_ARG_WITH(vendor-bug-url, [AS_HELP_STRING([--with-vendor-bug-url],
    7.47 +      [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])])
    7.48 +  if test "x$with_vendor_bug_url" = xyes; then
    7.49 +    AC_MSG_ERROR([--with-vendor-bug-url must have a value])
    7.50 +  elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then
    7.51 +    AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
    7.52 +  else
    7.53 +    VENDOR_URL_BUG="$with_vendor_bug_url"
    7.54 +  fi
    7.55 +  AC_SUBST(VENDOR_URL_BUG)
    7.56 +
    7.57 +  # The vendor VM bug URL, if any
    7.58 +  AC_ARG_WITH(vendor-vm-bug-url, [AS_HELP_STRING([--with-vendor-vm-bug-url],
    7.59 +      [Sets the bug URL which will be displayed when the VM crashes @<:@not specified@:>@])])
    7.60 +  if test "x$with_vendor_vm_bug_url" = xyes; then
    7.61 +    AC_MSG_ERROR([--with-vendor-vm-bug-url must have a value])
    7.62 +  elif [ ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ]; then
    7.63 +    AC_MSG_ERROR([--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url])
    7.64 +  else
    7.65 +    VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url"
    7.66 +  fi
    7.67 +  AC_SUBST(VENDOR_URL_VM_BUG)
    7.68 +
    7.69    AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year],
    7.70        [Set copyright year value for build @<:@current year@:>@])])
    7.71    if test "x$with_copyright_year" = xyes; then
     8.1 --- a/common/autoconf/libraries.m4	Wed Jul 03 20:04:13 2019 +0800
     8.2 +++ b/common/autoconf/libraries.m4	Wed Jul 03 20:37:44 2019 +0800
     8.3 @@ -57,6 +57,7 @@
     8.4      ALSA_NOT_NEEDED=yes
     8.5      PULSE_NOT_NEEDED=yes
     8.6      X11_NOT_NEEDED=yes
     8.7 +    FONTCONFIG_NOT_NEEDED=yes
     8.8      AC_MSG_RESULT([alsa cups pulse x11])
     8.9    fi
    8.10  
    8.11 @@ -65,6 +66,7 @@
    8.12      ALSA_NOT_NEEDED=yes
    8.13      PULSE_NOT_NEEDED=yes
    8.14      X11_NOT_NEEDED=yes
    8.15 +    FONTCONFIG_NOT_NEEDED=yes
    8.16      AC_MSG_RESULT([alsa pulse x11])
    8.17    fi
    8.18  
    8.19 @@ -703,6 +705,67 @@
    8.20    AC_SUBST(ALSA_LIBS)
    8.21  ])
    8.22  
    8.23 +################################################################################
    8.24 +# Setup fontconfig
    8.25 +################################################################################
    8.26 +AC_DEFUN_ONCE([LIB_SETUP_FONTCONFIG],
    8.27 +[
    8.28 +  AC_ARG_WITH(fontconfig, [AS_HELP_STRING([--with-fontconfig],
    8.29 +      [specify prefix directory for the fontconfig package
    8.30 +      (expecting the headers under PATH/include)])])
    8.31 +  AC_ARG_WITH(fontconfig-include, [AS_HELP_STRING([--with-fontconfig-include],
    8.32 +      [specify directory for the fontconfig include files])])
    8.33 +
    8.34 +  if test "x$FONTCONFIG_NOT_NEEDED" = xyes; then
    8.35 +    if (test "x${with_fontconfig}" != x && test "x${with_fontconfig}" != xno) || \
    8.36 +        (test "x${with_fontconfig_include}" != x && test "x${with_fontconfig_include}" != xno); then
    8.37 +      AC_MSG_WARN([[fontconfig not used, so --with-fontconfig[-*] is ignored]])
    8.38 +    fi
    8.39 +    FONTCONFIG_CFLAGS=
    8.40 +  else
    8.41 +    FONTCONFIG_FOUND=no
    8.42 +
    8.43 +    if test "x${with_fontconfig}" = xno || test "x${with_fontconfig_include}" = xno; then
    8.44 +      AC_MSG_ERROR([It is not possible to disable the use of fontconfig. Remove the --without-fontconfig option.])
    8.45 +    fi
    8.46 +
    8.47 +    if test "x${with_fontconfig}" != x; then
    8.48 +      AC_MSG_CHECKING([for fontconfig headers])
    8.49 +      if test -s "${with_fontconfig}/include/fontconfig/fontconfig.h"; then
    8.50 +        FONTCONFIG_CFLAGS="-I${with_fontconfig}/include"
    8.51 +        FONTCONFIG_FOUND=yes
    8.52 +        AC_MSG_RESULT([$FONTCONFIG_FOUND])
    8.53 +      else
    8.54 +        AC_MSG_ERROR([Can't find 'include/fontconfig/fontconfig.h' under ${with_fontconfig} given with the --with-fontconfig option.])
    8.55 +      fi
    8.56 +    fi
    8.57 +    if test "x${with_fontconfig_include}" != x; then
    8.58 +      AC_MSG_CHECKING([for fontconfig headers])
    8.59 +      if test -s "${with_fontconfig_include}/fontconfig/fontconfig.h"; then
    8.60 +        FONTCONFIG_CFLAGS="-I${with_fontconfig_include}"
    8.61 +        FONTCONFIG_FOUND=yes
    8.62 +        AC_MSG_RESULT([$FONTCONFIG_FOUND])
    8.63 +      else
    8.64 +        AC_MSG_ERROR([Can't find 'fontconfig/fontconfig.h' under ${with_fontconfig_include} given with the --with-fontconfig-include option.])
    8.65 +      fi
    8.66 +    fi
    8.67 +    if test "x$FONTCONFIG_FOUND" = xno; then
    8.68 +      # Are the fontconfig headers installed in the default /usr/include location?
    8.69 +      AC_CHECK_HEADERS([fontconfig/fontconfig.h], [
    8.70 +          FONTCONFIG_FOUND=yes
    8.71 +          FONTCONFIG_CFLAGS=
    8.72 +          DEFAULT_FONTCONFIG=yes
    8.73 +      ])
    8.74 +    fi
    8.75 +    if test "x$FONTCONFIG_FOUND" = xno; then
    8.76 +      HELP_MSG_MISSING_DEPENDENCY([fontconfig])
    8.77 +      AC_MSG_ERROR([Could not find fontconfig! $HELP_MSG ])
    8.78 +    fi
    8.79 +  fi
    8.80 +
    8.81 +  AC_SUBST(FONTCONFIG_CFLAGS)
    8.82 +])
    8.83 +
    8.84  AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
    8.85  [
    8.86  
     9.1 --- a/common/autoconf/spec.gmk.in	Wed Jul 03 20:04:13 2019 +0800
     9.2 +++ b/common/autoconf/spec.gmk.in	Wed Jul 03 20:37:44 2019 +0800
     9.3 @@ -1,5 +1,5 @@
     9.4  #
     9.5 -# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
     9.6 +# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
     9.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     9.8  #
     9.9  # This code is free software; you can redistribute it and/or modify it
    9.10 @@ -156,6 +156,18 @@
    9.11  NASHORN_TOPDIR:=@NASHORN_TOPDIR@
    9.12  COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@
    9.13  
    9.14 +# Platform naming variables
    9.15 +LAUNCHER_NAME:=@LAUNCHER_NAME@
    9.16 +PRODUCT_NAME:=@PRODUCT_NAME@
    9.17 +PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@
    9.18 +JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
    9.19 +COMPANY_NAME:=@COMPANY_NAME@
    9.20 +MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
    9.21 +MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
    9.22 +VENDOR_URL:=@VENDOR_URL@
    9.23 +VENDOR_URL_BUG:=@VENDOR_URL_BUG@
    9.24 +VENDOR_URL_VM_BUG:=@VENDOR_URL_VM_BUG@
    9.25 +
    9.26  # Location where build customization files may be found
    9.27  CUSTOM_MAKE_DIR:=@CUSTOM_MAKE_DIR@
    9.28  
    9.29 @@ -166,15 +178,33 @@
    9.30  JDK_UPDATE_VERSION:=@JDK_UPDATE_VERSION@
    9.31  JDK_BUILD_NUMBER:=@JDK_BUILD_NUMBER@
    9.32  MILESTONE:=@MILESTONE@
    9.33 -LAUNCHER_NAME:=@LAUNCHER_NAME@
    9.34 -PRODUCT_NAME:=@PRODUCT_NAME@
    9.35 -PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@
    9.36 -JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
    9.37 -COMPANY_NAME:=@COMPANY_NAME@
    9.38 -MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
    9.39 -MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
    9.40  USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@
    9.41  
    9.42 +ifneq ($(COMPANY_NAME),)
    9.43 +  # COMPANY_NAME is set to "N/A" in $AUTOCONF_DIR/version-numbers by default,
    9.44 +  # but can be customized with the '--with-vendor-name' configure option.
    9.45 +  # Only export "VENDOR" to the build if COMPANY_NAME contains a real value.
    9.46 +  # Otherwise the default value for VENDOR, which is used to set the "java.vendor"
    9.47 +  # and "java.vm.vendor" properties is hard-coded into the source code (i.e. in
    9.48 +  # System.c in the jdk for "vm.vendor" and vm_version.cpp in the VM for "java.vm.vendor")
    9.49 +  ifneq ($(COMPANY_NAME), N/A)
    9.50 +    VERSION_CFLAGS += -DVENDOR='"$(COMPANY_NAME)"'
    9.51 +  endif
    9.52 +endif
    9.53 +
    9.54 +# Only export VENDOR_URL, VENDOR_URL_BUG and VENDOR_VM_URL_BUG to the build if
    9.55 +# they are not empty. Otherwise, default values which are defined in the sources
    9.56 +# will be used.
    9.57 +ifneq ($(VENDOR_URL),)
    9.58 +  VERSION_CFLAGS += -DVENDOR_URL='"$(VENDOR_URL)"'
    9.59 +endif
    9.60 +ifneq ($(VENDOR_URL_BUG),)
    9.61 +  VERSION_CFLAGS += -DVENDOR_URL_BUG='"$(VENDOR_URL_BUG)"'
    9.62 +endif
    9.63 +ifneq ($(VENDOR_URL_VM_BUG),)
    9.64 +  VERSION_CFLAGS += -DVENDOR_URL_VM_BUG='"$(VENDOR_URL_VM_BUG)"'
    9.65 +endif
    9.66 +
    9.67  # Different version strings generated from the above information.
    9.68  JDK_VERSION:=@JDK_VERSION@
    9.69  RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)
    10.1 --- a/make/common/NativeCompilation.gmk	Wed Jul 03 20:04:13 2019 +0800
    10.2 +++ b/make/common/NativeCompilation.gmk	Wed Jul 03 20:37:44 2019 +0800
    10.3 @@ -492,6 +492,7 @@
    10.4  
    10.5          ifeq ($(ZIP_DEBUGINFO_FILES), true)
    10.6  ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
    10.7 +ifneq ($$($1_STRIP_POLICY), no_strip)
    10.8            $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
    10.9  
   10.10            ifeq ($(OPENJDK_TARGET_OS), windows)
   10.11 @@ -504,6 +505,7 @@
   10.12  		$(CD) $$($1_OBJECT_DIR) \
   10.13  		&& $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
   10.14            endif
   10.15 +endif # not possible when stripping is disabled
   10.16  endif # no MacOS X support yet
   10.17          else
   10.18            ifeq ($(OPENJDK_TARGET_OS), windows)
   10.19 @@ -584,6 +586,7 @@
   10.20  
   10.21          ifeq ($(ZIP_DEBUGINFO_FILES), true)
   10.22  ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
   10.23 +ifneq ($$($1_STRIP_POLICY), no_strip)
   10.24            $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
   10.25  
   10.26            ifeq ($(OPENJDK_TARGET_OS), windows)
   10.27 @@ -596,6 +599,7 @@
   10.28  		$(CD) $$($1_OBJECT_DIR) \
   10.29  		&& $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo
   10.30            endif
   10.31 +endif
   10.32  endif # no MacOS X support yet
   10.33          else
   10.34            ifeq ($(OPENJDK_TARGET_OS), windows)

mercurial