1.1 --- a/common/autoconf/generated-configure.sh Wed Jul 03 20:04:13 2019 +0800
1.2 +++ b/common/autoconf/generated-configure.sh Wed Jul 03 20:37:44 2019 +0800
1.3 @@ -657,6 +657,7 @@
1.4 USE_EXTERNAL_LIBZ
1.5 USE_EXTERNAL_LIBGIF
1.6 USE_EXTERNAL_LIBJPEG
1.7 +FONTCONFIG_CFLAGS
1.8 ALSA_LIBS
1.9 ALSA_CFLAGS
1.10 FREETYPE_BUNDLE_LIB_PATH
1.11 @@ -827,9 +828,12 @@
1.12 COOKED_JDK_UPDATE_VERSION
1.13 JDK_VERSION
1.14 COPYRIGHT_YEAR
1.15 +VENDOR_URL_VM_BUG
1.16 +VENDOR_URL_BUG
1.17 +VENDOR_URL
1.18 +COMPANY_NAME
1.19 MACOSX_BUNDLE_ID_BASE
1.20 MACOSX_BUNDLE_NAME_BASE
1.21 -COMPANY_NAME
1.22 JDK_RC_PLATFORM_NAME
1.23 PRODUCT_SUFFIX
1.24 PRODUCT_NAME
1.25 @@ -1059,6 +1063,10 @@
1.26 with_update_version
1.27 with_user_release_suffix
1.28 with_build_number
1.29 +with_vendor_name
1.30 +with_vendor_url
1.31 +with_vendor_bug_url
1.32 +with_vendor_vm_bug_url
1.33 with_copyright_year
1.34 with_boot_jdk
1.35 with_boot_jdk_jvmargs
1.36 @@ -1094,6 +1102,8 @@
1.37 with_alsa
1.38 with_alsa_include
1.39 with_alsa_lib
1.40 +with_fontconfig
1.41 +with_fontconfig_include
1.42 with_giflib
1.43 with_zlib
1.44 with_stdc__lib
1.45 @@ -1890,6 +1900,16 @@
1.46 Add a custom string to the version string if build
1.47 number isn't set.[username_builddateb00]
1.48 --with-build-number Set build number value for build [b00]
1.49 + --with-vendor-name Set vendor name. Among others, used to set the
1.50 + 'java.vendor' and 'java.vm.vendor' system
1.51 + properties. [not specified]
1.52 + --with-vendor-url Set the 'java.vendor.url' system property [not
1.53 + specified]
1.54 + --with-vendor-bug-url Set the 'java.vendor.url.bug' system property [not
1.55 + specified]
1.56 + --with-vendor-vm-bug-url
1.57 + Sets the bug URL which will be displayed when the VM
1.58 + crashes [not specified]
1.59 --with-copyright-year Set copyright year value for build [current year]
1.60 --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed]
1.61 --with-boot-jdk-jvmargs specify JVM arguments to be passed to all
1.62 @@ -1949,6 +1969,10 @@
1.63 headers under PATH/include)
1.64 --with-alsa-include specify directory for the alsa include files
1.65 --with-alsa-lib specify directory for the alsa library
1.66 + --with-fontconfig specify prefix directory for the fontconfig package
1.67 + (expecting the headers under PATH/include)
1.68 + --with-fontconfig-include
1.69 + specify directory for the fontconfig include files
1.70 --with-giflib use giflib from build system or OpenJDK source
1.71 (system, bundled) [bundled]
1.72 --with-zlib use zlib from build system or OpenJDK source
1.73 @@ -3830,6 +3854,8 @@
1.74 PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
1.75 cups)
1.76 PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
1.77 + fontconfig)
1.78 + PKGHANDLER_COMMAND="sudo apt-get install libfontconfig1-dev" ;;
1.79 freetype)
1.80 PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
1.81 pulse)
1.82 @@ -3851,6 +3877,8 @@
1.83 PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
1.84 cups)
1.85 PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
1.86 + fontconfig)
1.87 + PKGHANDLER_COMMAND="sudo yum install fontconfig-devel" ;;
1.88 freetype)
1.89 PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
1.90 pulse)
1.91 @@ -3985,6 +4013,11 @@
1.92
1.93
1.94
1.95 +################################################################################
1.96 +# Setup fontconfig
1.97 +################################################################################
1.98 +
1.99 +
1.100
1.101
1.102
1.103 @@ -4017,8 +4050,8 @@
1.104 #
1.105
1.106 #
1.107 -# This file has been modified by Loongson Technology in 2018. These
1.108 -# modifications are Copyright (c) 2018 Loongson Technology, and are made
1.109 +# This file has been modified by Loongson Technology in 2019. These
1.110 +# modifications are Copyright (c) 2018, 2019, Loongson Technology, and are made
1.111 # available on the same license terms set forth above.
1.112 #
1.113
1.114 @@ -4064,8 +4097,6 @@
1.115
1.116
1.117
1.118 -
1.119 -
1.120 #
1.121 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.122 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.123 @@ -19889,6 +19920,71 @@
1.124
1.125
1.126
1.127 + # The vendor name, if any
1.128 +
1.129 +# Check whether --with-vendor-name was given.
1.130 +if test "${with_vendor_name+set}" = set; then :
1.131 + withval=$with_vendor_name;
1.132 +fi
1.133 +
1.134 + if test "x$with_vendor_name" = xyes; then
1.135 + as_fn_error $? "--with-vendor-name must have a value" "$LINENO" 5
1.136 + elif ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ; then
1.137 + as_fn_error $? "--with-vendor-name contains non-printing characters: $with_vendor_name" "$LINENO" 5
1.138 + elif test "x$with_vendor_name" != x; then
1.139 + # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty.
1.140 + # Otherwise we will use the value from "version-numbers" included above.
1.141 + COMPANY_NAME="$with_vendor_name"
1.142 + fi
1.143 +
1.144 +
1.145 + # The vendor URL, if any
1.146 +
1.147 +# Check whether --with-vendor-url was given.
1.148 +if test "${with_vendor_url+set}" = set; then :
1.149 + withval=$with_vendor_url;
1.150 +fi
1.151 +
1.152 + if test "x$with_vendor_url" = xyes; then
1.153 + as_fn_error $? "--with-vendor-url must have a value" "$LINENO" 5
1.154 + elif ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ; then
1.155 + as_fn_error $? "--with-vendor-url contains non-printing characters: $with_vendor_url" "$LINENO" 5
1.156 + else
1.157 + VENDOR_URL="$with_vendor_url"
1.158 + fi
1.159 +
1.160 +
1.161 + # The vendor bug URL, if any
1.162 +
1.163 +# Check whether --with-vendor-bug-url was given.
1.164 +if test "${with_vendor_bug_url+set}" = set; then :
1.165 + withval=$with_vendor_bug_url;
1.166 +fi
1.167 +
1.168 + if test "x$with_vendor_bug_url" = xyes; then
1.169 + as_fn_error $? "--with-vendor-bug-url must have a value" "$LINENO" 5
1.170 + elif ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ; then
1.171 + as_fn_error $? "--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url" "$LINENO" 5
1.172 + else
1.173 + VENDOR_URL_BUG="$with_vendor_bug_url"
1.174 + fi
1.175 +
1.176 +
1.177 + # The vendor VM bug URL, if any
1.178 +
1.179 +# Check whether --with-vendor-vm-bug-url was given.
1.180 +if test "${with_vendor_vm_bug_url+set}" = set; then :
1.181 + withval=$with_vendor_vm_bug_url;
1.182 +fi
1.183 +
1.184 + if test "x$with_vendor_vm_bug_url" = xyes; then
1.185 + as_fn_error $? "--with-vendor-vm-bug-url must have a value" "$LINENO" 5
1.186 + elif ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ; then
1.187 + as_fn_error $? "--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url" "$LINENO" 5
1.188 + else
1.189 + VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url"
1.190 + fi
1.191 +
1.192
1.193
1.194 # Check whether --with-copyright-year was given.
1.195 @@ -40558,7 +40654,7 @@
1.196 -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
1.197 -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
1.198 -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
1.199 - -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
1.200 + -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
1.201 fi
1.202
1.203
1.204 @@ -42470,6 +42566,7 @@
1.205 ALSA_NOT_NEEDED=yes
1.206 PULSE_NOT_NEEDED=yes
1.207 X11_NOT_NEEDED=yes
1.208 + FONTCONFIG_NOT_NEEDED=yes
1.209 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa cups pulse x11" >&5
1.210 $as_echo "alsa cups pulse x11" >&6; }
1.211 fi
1.212 @@ -42480,6 +42577,7 @@
1.213 ALSA_NOT_NEEDED=yes
1.214 PULSE_NOT_NEEDED=yes
1.215 X11_NOT_NEEDED=yes
1.216 + FONTCONFIG_NOT_NEEDED=yes
1.217 { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5
1.218 $as_echo "alsa pulse x11" >&6; }
1.219 fi
1.220 @@ -47798,6 +47896,114 @@
1.221
1.222
1.223
1.224 +# Check whether --with-fontconfig was given.
1.225 +if test "${with_fontconfig+set}" = set; then :
1.226 + withval=$with_fontconfig;
1.227 +fi
1.228 +
1.229 +
1.230 +# Check whether --with-fontconfig-include was given.
1.231 +if test "${with_fontconfig_include+set}" = set; then :
1.232 + withval=$with_fontconfig_include;
1.233 +fi
1.234 +
1.235 +
1.236 + if test "x$FONTCONFIG_NOT_NEEDED" = xyes; then
1.237 + if (test "x${with_fontconfig}" != x && test "x${with_fontconfig}" != xno) || \
1.238 + (test "x${with_fontconfig_include}" != x && test "x${with_fontconfig_include}" != xno); then
1.239 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fontconfig not used, so --with-fontconfig[-*] is ignored" >&5
1.240 +$as_echo "$as_me: WARNING: fontconfig not used, so --with-fontconfig[-*] is ignored" >&2;}
1.241 + fi
1.242 + FONTCONFIG_CFLAGS=
1.243 + else
1.244 + FONTCONFIG_FOUND=no
1.245 +
1.246 + if test "x${with_fontconfig}" = xno || test "x${with_fontconfig_include}" = xno; then
1.247 + as_fn_error $? "It is not possible to disable the use of fontconfig. Remove the --without-fontconfig option." "$LINENO" 5
1.248 + fi
1.249 +
1.250 + if test "x${with_fontconfig}" != x; then
1.251 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig headers" >&5
1.252 +$as_echo_n "checking for fontconfig headers... " >&6; }
1.253 + if test -s "${with_fontconfig}/include/fontconfig/fontconfig.h"; then
1.254 + FONTCONFIG_CFLAGS="-I${with_fontconfig}/include"
1.255 + FONTCONFIG_FOUND=yes
1.256 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTCONFIG_FOUND" >&5
1.257 +$as_echo "$FONTCONFIG_FOUND" >&6; }
1.258 + else
1.259 + as_fn_error $? "Can't find 'include/fontconfig/fontconfig.h' under ${with_fontconfig} given with the --with-fontconfig option." "$LINENO" 5
1.260 + fi
1.261 + fi
1.262 + if test "x${with_fontconfig_include}" != x; then
1.263 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig headers" >&5
1.264 +$as_echo_n "checking for fontconfig headers... " >&6; }
1.265 + if test -s "${with_fontconfig_include}/fontconfig/fontconfig.h"; then
1.266 + FONTCONFIG_CFLAGS="-I${with_fontconfig_include}"
1.267 + FONTCONFIG_FOUND=yes
1.268 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTCONFIG_FOUND" >&5
1.269 +$as_echo "$FONTCONFIG_FOUND" >&6; }
1.270 + else
1.271 + as_fn_error $? "Can't find 'fontconfig/fontconfig.h' under ${with_fontconfig_include} given with the --with-fontconfig-include option." "$LINENO" 5
1.272 + fi
1.273 + fi
1.274 + if test "x$FONTCONFIG_FOUND" = xno; then
1.275 + # Are the fontconfig headers installed in the default /usr/include location?
1.276 + for ac_header in fontconfig/fontconfig.h
1.277 +do :
1.278 + ac_fn_cxx_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
1.279 +if test "x$ac_cv_header_fontconfig_fontconfig_h" = xyes; then :
1.280 + cat >>confdefs.h <<_ACEOF
1.281 +#define HAVE_FONTCONFIG_FONTCONFIG_H 1
1.282 +_ACEOF
1.283 +
1.284 + FONTCONFIG_FOUND=yes
1.285 + FONTCONFIG_CFLAGS=
1.286 + DEFAULT_FONTCONFIG=yes
1.287 +
1.288 +fi
1.289 +
1.290 +done
1.291 +
1.292 + fi
1.293 + if test "x$FONTCONFIG_FOUND" = xno; then
1.294 +
1.295 + # Print a helpful message on how to acquire the necessary build dependency.
1.296 + # fontconfig is the help tag: freetype, cups, pulse, alsa etc
1.297 + MISSING_DEPENDENCY=fontconfig
1.298 +
1.299 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.300 + cygwin_help $MISSING_DEPENDENCY
1.301 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.302 + msys_help $MISSING_DEPENDENCY
1.303 + else
1.304 + PKGHANDLER_COMMAND=
1.305 +
1.306 + case $PKGHANDLER in
1.307 + apt-get)
1.308 + apt_help $MISSING_DEPENDENCY ;;
1.309 + yum)
1.310 + yum_help $MISSING_DEPENDENCY ;;
1.311 + port)
1.312 + port_help $MISSING_DEPENDENCY ;;
1.313 + pkgutil)
1.314 + pkgutil_help $MISSING_DEPENDENCY ;;
1.315 + pkgadd)
1.316 + pkgadd_help $MISSING_DEPENDENCY ;;
1.317 + esac
1.318 +
1.319 + if test "x$PKGHANDLER_COMMAND" != x; then
1.320 + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.321 + fi
1.322 + fi
1.323 +
1.324 + as_fn_error $? "Could not find fontconfig! $HELP_MSG " "$LINENO" 5
1.325 + fi
1.326 + fi
1.327 +
1.328 +
1.329 +
1.330 +
1.331 +
1.332 ###############################################################################
1.333 #
1.334 # Check for the jpeg library
