CVS commit: pkgsrc/lang/openjdk8

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Dec  3 10:20:25 UTC 2024

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.105 -r1.106 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r1.26 -r1.27 \
    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.

Modified files:

Index: pkgsrc/lang/openjdk8/distinfo
diff -u pkgsrc/lang/openjdk8/distinfo:1.105 pkgsrc/lang/openjdk8/distinfo:1.106
--- pkgsrc/lang/openjdk8/distinfo:1.105 Fri Nov 29 03:29:08 2024
+++ pkgsrc/lang/openjdk8/distinfo       Tue Dec  3 10:20:25 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.105 2024/11/29 03:29:08 ryoon Exp $
+$NetBSD: distinfo,v 1.106 2024/12/03 10:20:25 jperkin Exp $
 
 BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 8745b980e290e509c0dd09706398b89afce85fee1405b9367b6684c83d56b96a
 SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 
6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4
@@ -38,7 +38,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) = 396eb5fa81eeb5d8979958400ee058204b7f9a30
+SHA1 (patch-common_autoconf_generated-configure.sh) = b0a225cd14014f9973eae8eaddbf615ae093fa1c
 SHA1 (patch-common_autoconf_spec.gmk.in) = 5fbf47f2241b5c898a75fb1741873043f1c983f0
 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.26 pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.27
--- pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.26      Fri Nov 29 03:29:08 2024
+++ pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh   Tue Dec  3 10:20:25 2024
@@ -1,4 +1,6 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.26 2024/11/29 03:29:08 ryoon Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.27 2024/12/03 10:20:25 jperkin Exp $
+
+Various fixes.
 
 --- common/autoconf/generated-configure.sh.orig        2024-11-11 15:38:40.000000000 +0000
 +++ common/autoconf/generated-configure.sh
@@ -228,7 +230,7 @@ $NetBSD: patch-common_autoconf_generated
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -25685,16 +25682,15 @@ $as_echo_n "checking flags for boot jdk 
+@@ -25685,16 +25682,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
@@ -306,6 +308,15 @@ $NetBSD: patch-common_autoconf_generated
    fi
    # The (cross) compiler is now configured, we can now test capabilities
    # of the target platform.
+@@ -42821,7 +42825,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+     LEGACY_TARGET_CFLAGS="$LEGACY_TARGET_CFLAGS -fstack-protector"
+     LEGACY_HOST_CXXFLAGS="$LEGACY_HOST_CXXFLAGS -fstack-protector"
+     LEGACY_TARGET_CXXFLAGS="$LEGACY_TARGET_CXXFLAGS -fstack-protector"
+-    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_HOST_LDFLAGS="$LEGACY_HOST_LDFLAGS -Wl,-z,relro"
+       LEGACY_TARGET_LDFLAGS="$LEGACY_TARGET_LDFLAGS -Wl,-z,relro"
 @@ -42872,7 +42876,7 @@ $as_echo "$supports" >&6; }
    elif test "x$TOOLCHAIN_TYPE" = xclang; then
      LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
@@ -394,7 +405,7 @@ $NetBSD: patch-common_autoconf_generated
      LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
    fi
  
-@@ -55724,7 +55733,7 @@ $as_echo_n "checking for memory size... 
+@@ -55724,7 +55733,7 @@ $as_echo_n "checking for memory size...
      FOUND_MEM=yes
    elif test "x$OPENJDK_BUILD_OS" = xbsd && test "x$(uname -s | grep -o BSD)" = xBSD; then
      # Looks like a BSD system