OpenJDK / jdk / hs
changeset 46936:b440e4b33965
8183119: Resolve 'libkstat' dependency between open and closed part of JDK
Reviewed-by: erikj, kvn
| author | phedlin |
|---|---|
| date | Mon, 28 Aug 2017 13:29:58 +0200 |
| parents | 80130bc22863 |
| children | 0cc133bf6722 58510a7115e4 |
| files | common/autoconf/flags.m4 common/autoconf/generated-configure.sh |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/flags.m4 Tue Aug 22 16:20:29 2017 +0200 +++ b/common/autoconf/flags.m4 Mon Aug 28 13:29:58 2017 +0200 @@ -1358,7 +1358,7 @@ $2SOLARIS_LIBM_LIBS="/usr/lib/sparcv9/libm.so.1" fi $2JVM_LIBS="[$]$2JVM_LIBS -lsocket -lsched -ldl $SOLARIS_LIBM_LIBS -lCrun \ - -lthread -ldoor -lc -ldemangle -lnsl -lkstat -lrt" + -lthread -ldoor -lc -ldemangle -lnsl -lrt" elif test "x$OPENJDK_$1_OS" = xmacosx; then $2JVM_LIBS="[$]$2JVM_LIBS -lm" elif test "x$OPENJDK_$1_OS" = xaix; then
--- a/common/autoconf/generated-configure.sh Tue Aug 22 16:20:29 2017 +0200 +++ b/common/autoconf/generated-configure.sh Mon Aug 28 13:29:58 2017 +0200 @@ -5151,7 +5151,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1503331668 +DATE_WHEN_GENERATED=1503919695 ############################################################################### # @@ -52064,7 +52064,7 @@ SOLARIS_LIBM_LIBS="/usr/lib/sparcv9/libm.so.1" fi JVM_LIBS="$JVM_LIBS -lsocket -lsched -ldl $SOLARIS_LIBM_LIBS -lCrun \ - -lthread -ldoor -lc -ldemangle -lnsl -lkstat -lrt" + -lthread -ldoor -lc -ldemangle -lnsl -lrt" elif test "x$OPENJDK_TARGET_OS" = xmacosx; then JVM_LIBS="$JVM_LIBS -lm" elif test "x$OPENJDK_TARGET_OS" = xaix; then @@ -52943,7 +52943,7 @@ OPENJDK_BUILD_SOLARIS_LIBM_LIBS="/usr/lib/sparcv9/libm.so.1" fi OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lsocket -lsched -ldl $SOLARIS_LIBM_LIBS -lCrun \ - -lthread -ldoor -lc -ldemangle -lnsl -lkstat -lrt" + -lthread -ldoor -lc -ldemangle -lnsl -lrt" elif test "x$OPENJDK_BUILD_OS" = xmacosx; then OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm" elif test "x$OPENJDK_BUILD_OS" = xaix; then @@ -62713,7 +62713,7 @@ if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then POTENTIAL_FREETYPE_INCLUDE_PATH="$FREETYPE_BASE_DIR/include" - POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu" + POTENTIAL_FREETYPE_LIB_PATH="$FREETYPE_BASE_DIR/lib/$OPENJDK_TARGET_CPU-linux-gnu" METHOD="well-known location" # Let's start with an optimistic view of the world :-)