summaryrefslogtreecommitdiff
path: root/lang/openjdk8/patches
diff options
context:
space:
mode:
authorryoon <ryoon>2016-02-08 14:45:39 +0000
committerryoon <ryoon>2016-02-08 14:45:39 +0000
commit3ca5ab8f100a90f462cc90520437923c6979a2f8 (patch)
tree6645d00e351872e5460692a94009d45f3d259839 /lang/openjdk8/patches
parent70939c1076a19f1df0668d6d14c7debc64973f7b (diff)
downloadpkgsrc-3ca5ab8f100a90f462cc90520437923c6979a2f8.tar.gz
Update to 1.8.72
Changelog: Fix following security vulnerabilities: CVE-2016-0499 CVE-2015-4925 CVE-2016-0472 CVE-2015-4921 CVE-2016-0467 CVE-2016-0461 CVE-2015-4923 Bug fixes: Bug Id Category Subcategory Description JDK-8133917 client-libs Please backport X11FontManager refactor to Java 8! JDK-8130136 client-libs 2d Swing window sometimes fails to repaint partially when it becomes exposed JDK-8132850 client-libs 2d java.lang.ArrayIndexOutOfBoundsException during text rendering with many fonts installed JDK-8137106 client-libs 2d EUDC (End User Defined Characters) are not displayed on Windows with Java 8u60+ JDK-8065081 client-libs demo Intermittent NPE in Java2Demo applet on Stop/Restart in appletviewer JDK-8081485 client-libs java.awt EDT auto shutdown is broken in case of new event queue usage JDK-8081787 client-libs java.awt [macosx] MalformedURLException is thrown during reading data for application/x-java-url;class=java.net.URL flavor JDK-8086038 client-libs java.awt [macosx] No available data flavors when copying from Microsoft Word for Mac JDK-8130776 client-libs java.awt Remove EmbeddedFrame.requestFocusToEmbedder() method JDK-8132382 client-libs java.awt [macosx] Crash during JMC or JavaFX execution when NSApplication is controlled by SWT or JavaFX libraries JDK-8136763 client-libs java.awt [macosx] java always returns only one value for "text/uri-list" dataflavor even if several files were copied JDK-8134828 client-libs javax.swing Scrollbar thumb disappears with Nimbus L&F JDK-8134917 client-libs javax.swing [macosx] JOptionPane doesn't receive mouse events when opened from a drop event JDK-8134356 core-libs {@code} tag contains &lt; and &gt; sequences JDK-8134569 core-libs Add tests for prototype callsites JDK-8134939 core-libs Improve toString method of Dynalink DynamicMethod objects JDK-8133249 core-libs java.io Occasional SIGSEGV: non thread-safe use of strerr in getLastErrorString JDK-8073644 core-libs java.lang.invoke Assertion in LambdaFormEditor.bindArgumentType is too strict JDK-8030785 core-libs java.lang:reflect Missing "since 1.8" javadoc for java.lang.reflect.Method:getParameterCount JDK-8072466 core-libs java.net Deadlock when initializing MulticastSocket and DatagramSocket JDK-8087190 core-libs java.net Regression in sun.net.util.IPAddressUtil.isIPv4LiteralAddress(String) JDK-8133015 core-libs java.net InetAddress.isReachable(tmout) returning wrong value on Windows for IPv6 JDK-8143397 core-libs java.net It looks like InetAddress.isReachable(timeout) works incorrectly JDK-6857566 core-libs java.nio (bf) DirectByteBuffer garbage creation can outpace reclamation JDK-8029516 core-libs java.nio (fs) WatchKey cancel unreliable on Windows JDK-8034057 core-libs java.nio Files.getFileStore and Files.isWritable do not work with SUBST'ed drives (win) JDK-8080115 core-libs java.nio (fs) Crash in libgio when calling Files.probeContentType(path) from parallel threads JDK-8130274 core-libs java.nio java/nio/file/FileStore/Basic.java fails when two successive stores in an iteration are determined to be equal JDK-8133232 core-libs java.nio [fs] Regex has redundant | in the char class JDK-8133647 core-libs java.nio (ch) Test java/nio/channels/AsynchronousSocketChannel/StressLoopback.java fails for Windows XP JDK-8137121 core-libs java.nio (fc) Infinite loop FileChannel.truncate JDK-8138819 core-libs java.nio (se) File descriptor leak when Selector.open fails JDK-8081794 core-libs java.text ParsePosition getErrorIndex returns 0 for TimeZone parsing problem JDK-8074032 core-libs java.time Instant.ofEpochMilli(millis).toEpochMilli() can throw arithmetic overflow in toEpochMilli() JDK-8133022 core-libs java.time Instant.toEpochMilli() silently overflows JDK-8139107 core-libs java.time DateTimeFormatter with Locale.UK throw a NullPointerException when parsing zone JDK-6907252 core-libs java.util.jar ZipFileInputStream Not Thread-Safe JDK-8038502 core-libs java.util.jar Deflater.needsInput() should use synchronization JDK-8134505 core-libs java.util:i18n Cleanup of "TimeZone_md.c" JDK-8129957 core-libs javax.naming Deadlock in JNDI LDAP implementation when closing the LDAP context JDK-8027137 core-libs jdk.nashorn Merge ScriptFunction and ScriptFunctionImpl JDK-8055917 core-libs jdk.nashorn jdk.nashorn.internal.codegen.CompilationPhase$N should be renamed to proper classes JDK-8068901 core-libs jdk.nashorn Surprising behavior with more than one functional interface on a class JDK-8068903 core-libs jdk.nashorn Can't invoke vararg @FunctionalInterface methods JDK-8073613 core-libs jdk.nashorn Here documents: how to avoid string interpolation? JDK-8073733 core-libs jdk.nashorn TypeError messages with "call" and "new" could be improved JDK-8087292 core-libs jdk.nashorn nashorn should have a "fail-fast" option for scripting, analog to bash "set -e" JDK-8087312 core-libs jdk.nashorn PropertyMapWrapper.equals should compare className JDK-8114838 core-libs jdk.nashorn Anonymous functions escape to surrounding scope when defined under "with" statement JDK-8129950 core-libs jdk.nashorn Wrong condition for checking absence of logger in MethodHandleFactory JDK-8129959 core-libs jdk.nashorn DebugLogger has unnecessary API methods JDK-8130234 core-libs jdk.nashorn Get rid of JSType.isNegativeZero JDK-8130307 core-libs jdk.nashorn improve Nashorn Javadoc target JDK-8130424 core-libs jdk.nashorn if directory specified with --dest-dir does not exist, only .class files are dumped and .js files are not JDK-8130476 core-libs jdk.nashorn Remove unused methods in Global.java JDK-8130663 core-libs jdk.nashorn 6 fields can be static fields in Global class JDK-8130853 core-libs jdk.nashorn Non-extensible global is not handled property JDK-8131039 core-libs jdk.nashorn after adding a function property to Object.prototype, JSON.parse with reviver function goes into infinite loop JDK-8131340 core-libs jdk.nashorn Varargs function is recompiled each time it is linked JDK-8131683 core-libs jdk.nashorn Delete fails over multiple scopes JDK-8133119 core-libs jdk.nashorn Error message associated with TypeError for call and new should include stringified Node JDK-8133300 core-libs jdk.nashorn Ensure symbol table immutability in Nashorn AST JDK-8133785 core-libs jdk.nashorn SharedScopeCall should be enabled for non-optim call sites even with optimistic compilation JDK-8134150 core-libs jdk.nashorn Make Nashorn Timing class both threadsafe and efficient JDK-8134484 core-libs jdk.nashorn disallow backquotes as heredoc end marker delimiters JDK-8134488 core-libs jdk.nashorn0 core-libs jdk.nashorn Dead var statement evacuation incorrectly descends into nested functions JDK-8134502 core-libs jdk.nashorn introduce abstraction for basic NodeVisitor usage JDK-8134609 core-libs jdk.nashorn Allow constructors with same prototoype e-libs jdk.nashorn Defer stack trace walking of NashornException for extracting line number and file name JDK-8134931 core-libs jdk.nashorn jdk.nashorn.internal.codegen.TypeMap should not use Map JDK-8134973 core-libs jdk.nashorn Control flow exceptions s JDK-8135075 core-libs jdk.nashorn Reorder short-circuit tests in ApplySpecialization to run cheapest first JDK-8135190 core-libs jdk.nashorn Method code too large in Babel browser.js script JDK-8135262 core-libs jdk.nashorn Sanitize CodeInstaller and ComJDK-8135337 core-libs jdk.nashorn NativeDebug.dumpCounters with incorrect scope count JDK-8136349 core-libs jdk.nashorn Typos patch for nashorn sources submitted on Sep 10, 2015 JDK-8136544 core-libs jdk.nashorn Call site switching to megamorphic causes incorrect property read JDK-8136694 core-libs jdk.nashorn Megemorphic scope access does not throw ReferenceError when property is missing JDK-8137258 core-libs jdk.nashorn JSObjectLinker and BrowserJSObjectLinker should not expose internal JS objects JDK-8137281 core-libs jdk.nashorn OutOfMemoryError with large numeric keys in JSON.parse JDK-8137333 core-libs jdk.nashorn Boundless soft caching of property map histories causes high memory pressure JDK-8138616 core-libs jdk.nashorn invokeFunction fails if function calls a function defined in GLOBAL_SCOPE JDK-8138632 core-libs jdk.nashorn Sparse array does not handle growth of underlying dense array JDK-8074696 core-svc debugger Remote debugging session hangs for several minutes when calling findBootType JDK-8074368 core-svc java.lang.management ThreadMXBean.getThreadInfo() corrupts memory when called with empty array for thread ids JDK-8133666 core-svc java.lang.management OperatingSystemMXBean reports abnormally high machine CPU consumption on Linux JDK-8075773 core-svc tools jps running as root fails after the fix of JDK-8050807 JDK-8139613 deploy push of backport of JDK-8081846 broke build JDK-8138650 deploy packager Packager cannot bundle Mac App Store Apps because JavaFX WebKit uses apple private APIs JDK-8133985 deploy plugin "Apply" button is permanently disabled in JCP, after roaming profile option is changed JDK-8134109 deploy plugin Applet2Manager.getMainDeploymentRuleSet ignores jar version. JDK-8134495 deploy plugin Cannot enable debugging on JNLP applet with java-vm-args params JDK-7156268 deploy webstart app is stuck when launching with javaagent if there is no jre info in deployment.properties JDK-8055464 deploy webstart Add a URL scheme handler to reliably launch .jnlp files - java part JDK-8056013 deploy webstart Web Start looks in currently directory for all classes prior to jars - slow JDK-8077380 deploy webstart JNLPSigning exception when signed jnlp is launched from local tomcat server JDK-8081846 deploy webstart Add a URL scheme handler to reliably launch .jnlp files - Windows registration part JDK-8135115 deploy webstart DRS1.3: App is not blocked when there is a invalid attribute in jnlp-checksum JDK-8135227 deploy webstart DRS 1.3 enhancements doesn't work as expected when load no href jnlp by "javaws <local_path_of_jnlp_file>" JDK-8136906 deploy webstart Extreme Application Startup Time due to frequent requests for the jnlp-6.0.dtd JDK-8139323 deploy webstart JNLPSignedResourcesHelperTest shows regression caused by JDK-8129600 JDK-8140264 deploy webstart create junit test for JDK-8136906 JDK-8140740 deploy webstart Test jnlp_file/applicationDesc/index.html\#args is failing JDK-8011858 hotspot compiler Use Compile::live_nodes() instead of Compile::unique() in appropriate places JDK-8058737 hotspot compiler CodeCache::find_blob fails with 'unsafe access to zombie method' JDK-8075805 hotspot compiler Crash while trying to release CompiledICHolder JDK-8134031 hotspot compiler Incorrect JIT compilation of complex code with inlining and escape analysis JDK-8134493 hotspot compiler Cleaning inline caches of unloaded nmethods should be done in sweeper JDK-8133193 hotspot gc Memory leak in G1 because G1RootProcessor doesn't have desctructor JDK-8029453 hotspot runtime java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java failed by timeout JDK-8135002 hotspot runtime Fix or remove broken links in objectMonitor.cpp comments JDK-8139150 hotspot runtime ClassVerifier frees exception message while it's still in use JDK-8140249 hotspot runtime JVM Crashing During startUp If Flight Recording is enabled JDK-7194452 security-libs java.security Remove "Reverse" PKIX CertPathBuilder implementation JDK-8130875 security-libs java.security Ucrypto library leaks memory when null output buffer is specified JDK-8136534 security-libs java.security Loading JKS keystore using non-null InputStream results in closed stream JDK-8132551 security-libs javax.crypto:pkcs11 Initialize local variables before returning them in p11_convert.c JDK-8067422 tools javac Lambda method names are unnecessarily unstable JDK-8071291 tools javac Compiler crashes trying to cast UnionType to IntersectionClassType JDK-8073519 xml jaxb schemagen does not report errors while generating xsd files
Diffstat (limited to 'lang/openjdk8/patches')
-rw-r--r--lang/openjdk8/patches/patch-common_autoconf_boot-jdk.m48
-rw-r--r--lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh48
2 files changed, 28 insertions, 28 deletions
diff --git a/lang/openjdk8/patches/patch-common_autoconf_boot-jdk.m4 b/lang/openjdk8/patches/patch-common_autoconf_boot-jdk.m4
index 1f2694abf50..b985b8a495f 100644
--- a/lang/openjdk8/patches/patch-common_autoconf_boot-jdk.m4
+++ b/lang/openjdk8/patches/patch-common_autoconf_boot-jdk.m4
@@ -1,11 +1,11 @@
-$NetBSD: patch-common_autoconf_boot-jdk.m4,v 1.1 2015/06/27 22:37:42 joerg Exp $
+$NetBSD: patch-common_autoconf_boot-jdk.m4,v 1.2 2016/02/08 14:45:39 ryoon Exp $
---- common/autoconf/boot-jdk.m4.orig 2015-06-27 20:05:32.000000000 +0000
+--- common/autoconf/boot-jdk.m4.orig 2016-02-08 13:44:13.000000000 +0000
+++ common/autoconf/boot-jdk.m4
-@@ -324,16 +324,15 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR
+@@ -334,16 +334,15 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR
# Maximum amount of heap memory.
# Maximum stack size.
- if test "x$BUILD_NUM_BITS" = x32; then
+ if test "x$BOOT_JDK_BITS" = x32; then
- JVM_MAX_HEAP=1100M
STACK_SIZE=768
else
diff --git a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
index 4d63f6037f0..3089b25a128 100644
--- a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
+++ b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
@@ -1,13 +1,13 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.7 2015/09/24 22:54:28 tnn Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.8 2016/02/08 14:45:39 ryoon Exp $
GCC support on SunOS.
Fix max heap.
Avoid requiring ALSA.
Fix broken configure check for llvm-config.
---- common/autoconf/generated-configure.sh.orig 2015-08-05 15:28:20.000000000 +0000
+--- common/autoconf/generated-configure.sh.orig 2016-02-08 13:44:13.000000000 +0000
+++ common/autoconf/generated-configure.sh
-@@ -6883,7 +6883,7 @@ test -n "$target_alias" &&
+@@ -6897,7 +6897,7 @@ test -n "$target_alias" &&
VAR_CPU_BITS=32
VAR_CPU_ENDIAN=big
;;
@@ -16,7 +16,7 @@ Fix broken configure check for llvm-config.
VAR_CPU=sparcv9
VAR_CPU_ARCH=sparc
VAR_CPU_BITS=64
-@@ -7030,7 +7030,7 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUI
+@@ -7050,7 +7050,7 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUI
VAR_CPU_BITS=32
VAR_CPU_ENDIAN=big
;;
@@ -25,7 +25,7 @@ Fix broken configure check for llvm-config.
VAR_CPU=sparcv9
VAR_CPU_ARCH=sparc
VAR_CPU_BITS=64
-@@ -8421,9 +8421,9 @@ done
+@@ -8454,9 +8454,9 @@ 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.
@@ -38,7 +38,7 @@ Fix broken configure check for llvm-config.
MAKE_CANDIDATE=""$MAKE""
DESCRIPTION="user supplied MAKE=$MAKE"
-@@ -12543,7 +12543,7 @@ fi
+@@ -12539,7 +12539,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/'`
@@ -47,10 +47,10 @@ Fix broken configure check for llvm-config.
# This is not a symbolic link! We are done!
break
fi
-@@ -16217,16 +16217,15 @@ $as_echo_n "checking flags for boot jdk
+@@ -16225,16 +16225,15 @@ $as_echo_n "checking flags for boot jdk
# Maximum amount of heap memory.
# Maximum stack size.
- if test "x$BUILD_NUM_BITS" = x32; then
+ if test "x$BOOT_JDK_BITS" = x32; then
- JVM_MAX_HEAP=1100M
STACK_SIZE=768
else
@@ -65,7 +65,7 @@ Fix broken configure check for llvm-config.
$ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5
$ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5
-@@ -19320,7 +19319,7 @@ $as_echo "$as_me: Downloading build depe
+@@ -19454,7 +19453,7 @@ $as_echo "(none, will use system headers
elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
COMPILER_CHECK_LIST="cl"
elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
@@ -74,7 +74,7 @@ Fix broken configure check for llvm-config.
elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
# Do not probe for cc on AIX.
COMPILER_CHECK_LIST="xlc_r"
-@@ -19774,7 +19773,7 @@ $as_echo_n "checking resolved symbolic l
+@@ -19910,7 +19909,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/'`
@@ -83,7 +83,7 @@ Fix broken configure check for llvm-config.
# This is not a symbolic link! We are done!
break
fi
-@@ -20212,7 +20211,7 @@ $as_echo_n "checking for resolved symbol
+@@ -20348,7 +20347,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/'`
@@ -92,7 +92,7 @@ Fix broken configure check for llvm-config.
# This is not a symbolic link! We are done!
break
fi
-@@ -20240,7 +20239,7 @@ $as_echo "no, keeping CC" >&6; }
+@@ -20376,7 +20375,7 @@ $as_echo "no, keeping CC" >&6; }
COMPILER=$CC
COMPILER_NAME=$COMPILER_NAME
@@ -101,7 +101,7 @@ Fix broken configure check for llvm-config.
# Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
$ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
-@@ -21375,7 +21374,7 @@ $as_echo_n "checking resolved symbolic l
+@@ -21511,7 +21510,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/'`
@@ -110,7 +110,7 @@ Fix broken configure check for llvm-config.
# This is not a symbolic link! We are done!
break
fi
-@@ -21813,7 +21812,7 @@ $as_echo_n "checking for resolved symbol
+@@ -21949,7 +21948,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/'`
@@ -119,7 +119,7 @@ Fix broken configure check for llvm-config.
# This is not a symbolic link! We are done!
break
fi
-@@ -21841,7 +21840,7 @@ $as_echo "no, keeping CXX" >&6; }
+@@ -21977,7 +21976,7 @@ $as_echo "no, keeping CXX" >&6; }
COMPILER=$CXX
COMPILER_NAME=$COMPILER_NAME
@@ -128,7 +128,7 @@ Fix broken configure check for llvm-config.
# Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
$ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
-@@ -29520,6 +29519,14 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -29390,6 +29389,14 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then
SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
fi
@@ -143,7 +143,7 @@ Fix broken configure check for llvm-config.
else
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
# If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
-@@ -29661,6 +29668,13 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -29531,6 +29538,13 @@ rm -f core conftest.err conftest.$ac_obj
C_O_FLAG_NORM="-Os"
C_O_FLAG_NONE=""
;;
@@ -157,7 +157,7 @@ Fix broken configure check for llvm-config.
*)
C_O_FLAG_HI="-O3"
C_O_FLAG_NORM="-O2"
-@@ -29862,7 +29876,7 @@ fi
+@@ -29732,7 +29746,7 @@ fi
#
case $COMPILER_NAME in
gcc )
@@ -166,7 +166,7 @@ Fix broken configure check for llvm-config.
-pipe \
-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
case $OPENJDK_TARGET_CPU_ARCH in
-@@ -30475,7 +30489,8 @@ $as_echo "alsa pulse x11" >&6; }
+@@ -30343,7 +30357,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; }
@@ -176,7 +176,7 @@ Fix broken configure check for llvm-config.
ALSA_NOT_NEEDED=yes
PULSE_NOT_NEEDED=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
-@@ -31701,7 +31716,11 @@ $as_echo "$as_me: WARNING: freetype not
+@@ -31555,7 +31570,11 @@ $as_echo "$as_me: WARNING: freetype not
# Allow --with-freetype-lib and --with-freetype-include to override
if test "x$with_freetype_include" != x; then
@@ -189,7 +189,7 @@ Fix broken configure check for llvm-config.
fi
if test "x$with_freetype_lib" != x; then
POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
-@@ -34519,7 +34538,7 @@ $as_echo "$as_me: The path of FREETYPE_I
+@@ -34373,7 +34392,7 @@ $as_echo "$as_me: The path of FREETYPE_I
FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
fi
@@ -198,7 +198,7 @@ Fix broken configure check for llvm-config.
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
else
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
-@@ -34652,7 +34671,7 @@ $as_echo "$as_me: The path of FREETYPE_L
+@@ -34506,7 +34525,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
@@ -207,7 +207,7 @@ Fix broken configure check for llvm-config.
fi
fi
-@@ -35878,9 +35897,6 @@ fi
+@@ -35732,9 +35751,6 @@ fi
@@ -217,7 +217,7 @@ Fix broken configure check for llvm-config.
llvm_components="jit mcjit engine nativecodegen native"
unset LLVM_CFLAGS
-@@ -35923,7 +35939,7 @@ fi
+@@ -35777,7 +35793,7 @@ fi
fi
# libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)