Received: by mail.netbsd.org (Postfix, from userid 605) id 5DECD84FA8; Sun, 24 Feb 2019 16:43:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D94EE84DED for ; Sun, 24 Feb 2019 16:43:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id E5Ol0gCC2lWx for ; Sun, 24 Feb 2019 16:43:28 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9499284CE9 for ; Sun, 24 Feb 2019 16:43:28 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8EBF8FB16; Sun, 24 Feb 2019 16:43:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_155102660828590" MIME-Version: 1.0 Date: Sun, 24 Feb 2019 16:43:28 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang/openjdk8 To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20190224164328.8EBF8FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_155102660828590 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Sun Feb 24 16:43:28 UTC 2019 Modified Files: pkgsrc/lang/openjdk8: distinfo pkgsrc/lang/openjdk8/patches: patch-common_autoconf_generated-configure.sh Log Message: openjdk8: Disable relro on SunOS. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 pkgsrc/lang/openjdk8/distinfo cvs rdiff -u -r1.16 -r1.17 \ pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_155102660828590 Content-Disposition: inline Content-Length: 19664 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/openjdk8/distinfo diff -u pkgsrc/lang/openjdk8/distinfo:1.67 pkgsrc/lang/openjdk8/distinfo:1.68 --- pkgsrc/lang/openjdk8/distinfo:1.67 Tue Feb 19 17:04:53 2019 +++ pkgsrc/lang/openjdk8/distinfo Sun Feb 24 16:43:28 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.67 2019/02/19 17:04:53 ryoon Exp $ +$NetBSD: distinfo,v 1.68 2019/02/24 16:43:28 jperkin Exp $ SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 @@ -63,7 +63,7 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df1 SHA1 (patch-bi) = 5409f0944d6f850baeaaa7c64d2e8ad52233e1e9 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892 SHA1 (patch-common_autoconf_boot-jdk.m4) = a29767c79544dea243019cc841d834f756172462 -SHA1 (patch-common_autoconf_generated-configure.sh) = bb925091b859f6feea7963b9d99d3c7d6654982f +SHA1 (patch-common_autoconf_generated-configure.sh) = ef90427a50ceef8b3761a44a4456a3da5348867e SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = 6e4c41b080577ed7cd418ee3b84f7f5a73dd11e6 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928 Index: pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh diff -u pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.16 pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.17 --- pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.16 Sat Dec 15 20:27:45 2018 +++ pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh Sun Feb 24 16:43:28 2019 @@ -1,11 +1,11 @@ -$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.16 2018/12/15 20:27:45 jperkin Exp $ +$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.17 2019/02/24 16:43:28 jperkin Exp $ BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386) and pkg/53223. ---- common/autoconf/generated-configure.sh.orig 2018-12-09 09:50:43.000000000 +0000 +--- common/autoconf/generated-configure.sh.orig 2019-02-19 13:34:21.000000000 +0000 +++ common/autoconf/generated-configure.sh -@@ -4132,7 +4132,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi +@@ -4137,7 +4137,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi # These toolchains are valid on different platforms VALID_TOOLCHAINS_bsd="clang gcc" VALID_TOOLCHAINS_linux="gcc clang" @@ -14,7 +14,7 @@ pkg/53223. VALID_TOOLCHAINS_macosx="gcc clang" VALID_TOOLCHAINS_aix="xlc" VALID_TOOLCHAINS_windows="microsoft" -@@ -15404,9 +15404,6 @@ done +@@ -15416,9 +15416,6 @@ done # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. if test "x$MAKE" != x; then # User has supplied a make, test it. @@ -24,7 +24,7 @@ pkg/53223. MAKE_CANDIDATE=""$MAKE"" DESCRIPTION="user supplied MAKE=$MAKE" -@@ -19994,7 +19991,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -20006,7 +20003,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -33,7 +33,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -20326,7 +20323,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -20338,7 +20335,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -42,7 +42,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -20644,7 +20641,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -20656,7 +20653,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -51,7 +51,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -20832,7 +20829,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -20844,7 +20841,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -60,7 +60,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -21110,7 +21107,7 @@ fi +@@ -21122,7 +21119,7 @@ fi # Resolve file symlinks while test $COUNTER -lt 20; do ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` @@ -69,7 +69,7 @@ pkg/53223. # This is not a symbolic link! We are done! break fi -@@ -21160,7 +21157,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -21172,7 +21169,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -78,7 +78,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -21375,7 +21372,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -21387,7 +21384,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -87,7 +87,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -21555,7 +21552,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -21567,7 +21564,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -96,7 +96,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -21763,7 +21760,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -21775,7 +21772,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -105,7 +105,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -21943,7 +21940,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -21955,7 +21952,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -114,7 +114,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -22151,7 +22148,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -22163,7 +22160,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -123,7 +123,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -22331,7 +22328,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -22343,7 +22340,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -132,7 +132,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -22539,7 +22536,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -22551,7 +22548,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -141,7 +141,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -22719,7 +22716,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -22731,7 +22728,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -150,7 +150,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -22914,7 +22911,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -22926,7 +22923,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -159,7 +159,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -23092,7 +23089,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -23104,7 +23101,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -168,7 +168,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -23288,7 +23285,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -23300,7 +23297,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -177,7 +177,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -23466,7 +23463,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -23478,7 +23475,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -186,7 +186,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -23661,7 +23658,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -23673,7 +23670,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -195,7 +195,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -23839,7 +23836,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -23851,7 +23848,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -204,7 +204,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -24035,7 +24032,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -24047,7 +24044,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -213,7 +213,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -24213,7 +24210,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -24225,7 +24222,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -222,7 +222,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -24390,7 +24387,7 @@ $as_echo "$as_me: Potential Boot JDK fou +@@ -24402,7 +24399,7 @@ $as_echo "$as_me: Potential Boot JDK fou BOOT_JDK_FOUND=no else # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? @@ -231,7 +231,7 @@ pkg/53223. # Extra M4 quote needed to protect [] in grep expression. FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` -@@ -24796,16 +24793,15 @@ $as_echo_n "checking flags for boot jdk +@@ -24808,16 +24805,15 @@ $as_echo_n "checking flags for boot jdk # Maximum amount of heap memory. # Maximum stack size. if test "x$BOOT_JDK_BITS" = x32; then @@ -249,7 +249,7 @@ pkg/53223. $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5 $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5 -@@ -27334,7 +27330,7 @@ $as_echo_n "checking resolved symbolic l +@@ -27351,7 +27347,7 @@ $as_echo_n "checking resolved symbolic l # Resolve file symlinks while test $COUNTER -lt 20; do ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` @@ -258,7 +258,7 @@ pkg/53223. # This is not a symbolic link! We are done! break fi -@@ -27789,7 +27785,7 @@ $as_echo_n "checking for resolved symbol +@@ -27806,7 +27802,7 @@ $as_echo_n "checking for resolved symbol # Resolve file symlinks while test $COUNTER -lt 20; do ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` @@ -267,7 +267,7 @@ pkg/53223. # This is not a symbolic link! We are done! break fi -@@ -29075,7 +29071,7 @@ $as_echo_n "checking resolved symbolic l +@@ -29092,7 +29088,7 @@ $as_echo_n "checking resolved symbolic l # Resolve file symlinks while test $COUNTER -lt 20; do ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` @@ -276,7 +276,7 @@ pkg/53223. # This is not a symbolic link! We are done! break fi -@@ -29530,7 +29526,7 @@ $as_echo_n "checking for resolved symbol +@@ -29547,7 +29543,7 @@ $as_echo_n "checking for resolved symbol # Resolve file symlinks while test $COUNTER -lt 20; do ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` @@ -285,7 +285,7 @@ pkg/53223. # This is not a symbolic link! We are done! break fi -@@ -41214,6 +41210,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } +@@ -41263,6 +41259,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN" SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1' SET_SHARED_LIBRARY_MAPFILE='' @@ -298,7 +298,7 @@ pkg/53223. else # Default works for linux, might work on other platforms as well. SHARED_LIBRARY_FLAGS='-shared' -@@ -41262,7 +41264,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; } +@@ -41311,7 +41313,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; } if test "x$OPENJDK_TARGET_OS" = xsolaris; then CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__" CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__" @@ -308,7 +308,16 @@ pkg/53223. fi # The (cross) compiler is now configured, we can now test capabilities # of the target platform. -@@ -42453,7 +42457,8 @@ $as_echo "alsa pulse x11" >&6; } +@@ -41460,7 +41464,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; } + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" + ;; + esac +- if test "x$OPENJDK_TARGET_OS" != xmacosx; then ++ if test "x$OPENJDK_TARGET_OS" != xmacosx -a test "x$OPENJDK_TARGET_OS" != xsolaris; then + LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" + LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" + fi +@@ -42536,7 +42540,8 @@ $as_echo "alsa pulse x11" >&6; } if test "x$OPENJDK_TARGET_OS" = xbsd; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5 $as_echo_n "checking what is not needed on BSD?... " >&6; } @@ -318,7 +327,7 @@ pkg/53223. ALSA_NOT_NEEDED=yes PULSE_NOT_NEEDED=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 -@@ -43683,7 +43688,7 @@ $as_echo "$as_me: WARNING: Can't find pr +@@ -43766,7 +43771,7 @@ $as_echo "$as_me: WARNING: Can't find pr BUILD_FREETYPE=no fi # Now check if configure found a version of 'msbuild.exe' @@ -327,7 +336,7 @@ pkg/53223. { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&5 $as_echo "$as_me: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&2;} BUILD_FREETYPE=no -@@ -44099,7 +44104,11 @@ $as_echo "$as_me: WARNING: --with-freety +@@ -44182,7 +44187,11 @@ $as_echo "$as_me: WARNING: --with-freety # Allow --with-freetype-lib and --with-freetype-include to override if test "x$with_freetype_include" != x; then @@ -340,7 +349,7 @@ pkg/53223. fi if test "x$with_freetype_lib" != x; then POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib" -@@ -47209,7 +47218,7 @@ $as_echo "$as_me: The path of FREETYPE_I +@@ -47292,7 +47301,7 @@ $as_echo "$as_me: The path of FREETYPE_I FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`" fi @@ -349,7 +358,7 @@ pkg/53223. FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH" else FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH" -@@ -47342,7 +47351,7 @@ $as_echo "$as_me: The path of FREETYPE_L +@@ -47425,7 +47434,7 @@ $as_echo "$as_me: The path of FREETYPE_L if test "x$OPENJDK_TARGET_OS" = xwindows; then FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib" else @@ -358,7 +367,7 @@ pkg/53223. fi fi -@@ -48571,9 +48580,6 @@ fi +@@ -48654,9 +48663,6 @@ fi @@ -368,7 +377,7 @@ pkg/53223. llvm_components="jit mcjit engine nativecodegen native" unset LLVM_CFLAGS -@@ -48616,7 +48622,7 @@ fi +@@ -48699,7 +48705,7 @@ fi fi # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so) --_----------=_155102660828590--