components/runtime/openjdk-23/patches/make_autoconf_flags-cflags.m4.patch

   1 $NetBSD$
   2
   3 Support for SunOS/gcc.
   4
   5 --- a/make/autoconf/flags-cflags.m4.orig        2019-01-08 09:40:27.000000000 +0000
   6 +++ b/make/autoconf/flags-cflags.m4
   7 @@ -42,7 +42,13 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
   8      # overridden using LD_LIBRARY_PATH. See JDK-8326891 for more information.
   9      SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1 -Wl,--disable-new-dtags'
  10      SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
  11 +   if test "x$OPENJDK_TARGET_OS" = xsolaris; then
  12 +    SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
  13 +    SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
  14 +    SET_SHARED_LIBRARY_NAME='-Wl,-h,[$]1'
  15 +   else
  16      SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
  17 +   fi
  18
  19    elif test "x$TOOLCHAIN_TYPE" = xclang; then
  20      if test "x$OPENJDK_TARGET_OS" = xmacosx; then
  21 @@ -66,7 +72,11 @@
  22        if test "x$OPENJDK_TARGET_OS" = xlinux; then
  23          SET_EXECUTABLE_ORIGIN="$SET_EXECUTABLE_ORIGIN -Wl,--disable-new-dtags"
  24        fi
  25 -      SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
  26 +      if test "x$OPENJDK_TARGET_OS" = xsolaris; then
  27 +        SET_SHARED_LIBRARY_NAME='-Wl,-h,[$]1'
  28 +      else
  29 +        SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
  30 +      fi
  31
  32        # arm specific settings
  33        if test "x$OPENJDK_TARGET_CPU" = "xarm"; then
  34 @@ -502,6 +512,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
  35
  36    if test "x$TOOLCHAIN_TYPE" = xgcc; then
  37      ALWAYS_DEFINES_JVM="-D_GNU_SOURCE -D_REENTRANT"
  38 +    ALWAYS_DEFINES_JDK="-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
  39    elif test "x$TOOLCHAIN_TYPE" = xclang; then
  40      ALWAYS_DEFINES_JVM="-D_GNU_SOURCE"
  41    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then