pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/lang/openjdk17



Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Oct  1 14:48:48 UTC 2024

Modified Files:
        pkgsrc/lang/openjdk17: Makefile PLIST distinfo
        pkgsrc/lang/openjdk17/patches: patch-make_autoconf_flags-cflags.m4

Log Message:
lang/openjdk17: Update to 1.17.0.12.7

Changelog:
Updated BSD port of JDK 17

Additional features include:

    Update to 17.0.12 GA


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/openjdk17/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/openjdk17/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/openjdk17/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/openjdk17/patches/patch-make_autoconf_flags-cflags.m4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk17/Makefile
diff -u pkgsrc/lang/openjdk17/Makefile:1.24 pkgsrc/lang/openjdk17/Makefile:1.25
--- pkgsrc/lang/openjdk17/Makefile:1.24 Fri May 31 21:44:37 2024
+++ pkgsrc/lang/openjdk17/Makefile      Tue Oct  1 14:48:48 2024
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2024/05/31 21:44:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2024/10/01 14:48:48 ryoon Exp $
 
 DISTNAME=      jdk17u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk17-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=        jdk17u
-GITHUB_TAG=    jdk-17.0.11+9-1
+GITHUB_TAG=    jdk-17.0.12+7-1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://openjdk.java.net/

Index: pkgsrc/lang/openjdk17/PLIST
diff -u pkgsrc/lang/openjdk17/PLIST:1.3 pkgsrc/lang/openjdk17/PLIST:1.4
--- pkgsrc/lang/openjdk17/PLIST:1.3     Wed Jan 17 07:03:00 2024
+++ pkgsrc/lang/openjdk17/PLIST Tue Oct  1 14:48:48 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2024/01/17 07:03:00 nikita Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/10/01 14:48:48 ryoon Exp $
 bin/openjdk17-jar
 bin/openjdk17-jarsigner
 bin/openjdk17-java
@@ -294,6 +294,7 @@ java/openjdk17/legal/java.base/c-libutl.
 java/openjdk17/legal/java.base/cldr.md
 java/openjdk17/legal/java.base/icu.md
 java/openjdk17/legal/java.base/public_suffix.md
+java/openjdk17/legal/java.base/siphash.md
 java/openjdk17/legal/java.base/unicode.md
 java/openjdk17/legal/java.compiler/ADDITIONAL_LICENSE_INFO
 java/openjdk17/legal/java.compiler/ASSEMBLY_EXCEPTION

Index: pkgsrc/lang/openjdk17/distinfo
diff -u pkgsrc/lang/openjdk17/distinfo:1.19 pkgsrc/lang/openjdk17/distinfo:1.20
--- pkgsrc/lang/openjdk17/distinfo:1.19 Fri May 31 21:44:37 2024
+++ pkgsrc/lang/openjdk17/distinfo      Tue Oct  1 14:48:48 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2024/05/31 21:44:37 ryoon Exp $
+$NetBSD: distinfo,v 1.20 2024/10/01 14:48:48 ryoon Exp $
 
 BLAKE2s (bootstrap-jdk-1.17.0.3.7-netbsd-9-aarch64-20220516.tar.xz) = b632092d25292e795a2d7567ec55d03f21021dbba27eab3e81a48aed5e5bdd68
 SHA512 (bootstrap-jdk-1.17.0.3.7-netbsd-9-aarch64-20220516.tar.xz) = fb86749d56be94cc1509f92d8fbdec481b0c7f6fdd5e731826098e6eaa668539052571ffd09125346c1920262b07857ea675799ab8476fcff53c03e158536c1d
@@ -12,12 +12,12 @@ Size (bootstrap-jdk-1.17.0.3.7-netbsd-9-
 BLAKE2s (bootstrap-jdk-1.17.0.3.7-netbsd-9-i386-20220515.tar.xz) = a8e6a44e1470cf2e8845f6b5a6edff142d06c76e12a793b5991b1bf05cf36a98
 SHA512 (bootstrap-jdk-1.17.0.3.7-netbsd-9-i386-20220515.tar.xz) = 9fc54d9a31270cbec5e0454bbf1ddf3bb99ab5c916660e1f5e89163b384368a7f1fd5311db71b21c1638eb916899199a1080e90cc1f9615bfdbd871bb94a3216
 Size (bootstrap-jdk-1.17.0.3.7-netbsd-9-i386-20220515.tar.xz) = 103902136 bytes
-BLAKE2s (jdk17u-jdk-17.0.11-9-1.tar.gz) = 2709e9e708515b48674cdf6837872f7bea37cddf0893595722544c025b0c6409
-SHA512 (jdk17u-jdk-17.0.11-9-1.tar.gz) = 2e3b5af60e04e60ee751365c498d2e5e037325b4229cdecc1165c3173d6d41190b3f76ca67c22e229fa0db3c59f5dbf1b101f256f0953d68bb586f414f592470
-Size (jdk17u-jdk-17.0.11-9-1.tar.gz) = 106698083 bytes
+BLAKE2s (jdk17u-jdk-17.0.12-7-1.tar.gz) = 970c039de3a33a1c1ffc942949952e2bb7b22eecd0f6ca7b09bc37190f47cd68
+SHA512 (jdk17u-jdk-17.0.12-7-1.tar.gz) = f40f6919f590ef4c9a060df570d96c4c8d9dbf86d04b05ba128ee3a530df09733f5c056b754d74bf618f22ea96cfd41b661bdbc5126a0cd82ca8411d32e4c786
+Size (jdk17u-jdk-17.0.12-7-1.tar.gz) = 106710435 bytes
 SHA1 (patch-make_autoconf_build-performance.m4) = 1617779af212d6c7f8ffba19c9cb45554392b714
 SHA1 (patch-make_autoconf_buildjdk-spec.gmk.in) = 01b6ac6dae1a886949020b9d472aab1e357084b0
-SHA1 (patch-make_autoconf_flags-cflags.m4) = 0379aeecc6181cbd15f6f31518b73ca915f1f73b
+SHA1 (patch-make_autoconf_flags-cflags.m4) = 2777471821988895f5ae1be33b1c92b7386b068a
 SHA1 (patch-make_autoconf_hotspot.m4) = 6370c6cb2a3f225c502e7916342104cf1288f4cf
 SHA1 (patch-make_autoconf_lib-alsa.m4) = 999fbf951363f6b49b22aad81537728f22d7c381
 SHA1 (patch-make_autoconf_lib-bundled.m4) = 6f4720cf9fcd9088e5e186940794b868e71dcc80

Index: pkgsrc/lang/openjdk17/patches/patch-make_autoconf_flags-cflags.m4
diff -u pkgsrc/lang/openjdk17/patches/patch-make_autoconf_flags-cflags.m4:1.1 pkgsrc/lang/openjdk17/patches/patch-make_autoconf_flags-cflags.m4:1.2
--- pkgsrc/lang/openjdk17/patches/patch-make_autoconf_flags-cflags.m4:1.1       Fri May 13 14:24:19 2022
+++ pkgsrc/lang/openjdk17/patches/patch-make_autoconf_flags-cflags.m4   Tue Oct  1 14:48:48 2024
@@ -1,30 +1,32 @@
-$NetBSD: patch-make_autoconf_flags-cflags.m4,v 1.1 2022/05/13 14:24:19 ryoon Exp $
+$NetBSD: patch-make_autoconf_flags-cflags.m4,v 1.2 2024/10/01 14:48:48 ryoon Exp $
 
 We prefer to use explicit run paths.
 
---- make/autoconf/flags-cflags.m4.orig 2022-02-05 03:44:09.000000000 +0000
+--- make/autoconf/flags-cflags.m4.orig 2024-07-27 15:26:53.000000000 +0000
 +++ make/autoconf/flags-cflags.m4
-@@ -37,8 +37,8 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
-   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-     # Default works for linux, might work on other platforms as well.
-     SHARED_LIBRARY_FLAGS='-shared'
--    SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
+@@ -40,8 +40,8 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
+     # --disable-new-dtags forces use of RPATH instead of RUNPATH for rpaths.
+     # This protects internal library dependencies within the JDK from being
+     # overridden using LD_LIBRARY_PATH. See JDK-8326891 for more information.
+-    SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1 -Wl,--disable-new-dtags'
 -    SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
 +    SET_EXECUTABLE_ORIGIN='@COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib @COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib/server'
 +    SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
      SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
      SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
  
-@@ -54,17 +54,11 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
+@@ -65,20 +65,13 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
      else
        # Default works for linux, might work on other platforms as well.
        SHARED_LIBRARY_FLAGS='-shared'
 -      SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
 +      SET_EXECUTABLE_ORIGIN='@COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib @COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib/server'
-+      SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
+       if test "x$OPENJDK_TARGET_OS" = xlinux; then
+         SET_EXECUTABLE_ORIGIN="$SET_EXECUTABLE_ORIGIN -Wl,--disable-new-dtags"
+       fi
        SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
        SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
- 
+-
 -      # arm specific settings
 -      if test "x$OPENJDK_TARGET_CPU" = "xarm"; then
 -        # '-Wl,-z,origin' isn't used on arm.
@@ -32,6 +34,7 @@ We prefer to use explicit run paths.
 -      else
 -        SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
 -      fi
++      SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
      fi
  
    elif test "x$TOOLCHAIN_TYPE" = xxlc; then



Home | Main Index | Thread Index | Old Index