CVS commit: pkgsrc/lang/openjdk21

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/openjdk21
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Tue, 1 Oct 2024 14:49:40 +0000

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

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

Log Message:
lang/openjdk21: Update to 1.21.0.4.7

Changelog:
Updated BSD port of JDK 21

Additional features include:

    Update to 21.0.4 GA


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/openjdk21/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/openjdk21/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/openjdk21/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/openjdk21/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/openjdk21/Makefile
diff -u pkgsrc/lang/openjdk21/Makefile:1.8 pkgsrc/lang/openjdk21/Makefile:1.9
--- pkgsrc/lang/openjdk21/Makefile:1.8  Fri May 31 21:45:14 2024
+++ pkgsrc/lang/openjdk21/Makefile      Tue Oct  1 14:49:40 2024
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2024/05/31 21:45:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2024/10/01 14:49:40 ryoon Exp $
 
 DISTNAME=      jdk21u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk21-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=        jdk21u
-GITHUB_TAG=    jdk-21.0.3+9-1
+GITHUB_TAG=    jdk-21.0.4+7-1
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
 HOMEPAGE=      https://openjdk.java.net/

Index: pkgsrc/lang/openjdk21/PLIST
diff -u pkgsrc/lang/openjdk21/PLIST:1.4 pkgsrc/lang/openjdk21/PLIST:1.5
--- pkgsrc/lang/openjdk21/PLIST:1.4     Thu Dec  7 16:26:37 2023
+++ pkgsrc/lang/openjdk21/PLIST Tue Oct  1 14:49:40 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2023/12/07 16:26:37 tnn Exp $
+@comment $NetBSD: PLIST,v 1.5 2024/10/01 14:49:40 ryoon Exp $
 bin/openjdk21-jar
 bin/openjdk21-jarsigner
 bin/openjdk21-java
@@ -259,6 +259,7 @@ java/openjdk21/legal/java.base/c-libutl.
 java/openjdk21/legal/java.base/cldr.md
 java/openjdk21/legal/java.base/icu.md
 java/openjdk21/legal/java.base/public_suffix.md
+java/openjdk21/legal/java.base/siphash.md
 java/openjdk21/legal/java.base/unicode.md
 ${PLIST.jdk_bundled_zlib}java/openjdk21/legal/java.base/zlib.md
 java/openjdk21/legal/java.compiler/ADDITIONAL_LICENSE_INFO

Index: pkgsrc/lang/openjdk21/distinfo
diff -u pkgsrc/lang/openjdk21/distinfo:1.6 pkgsrc/lang/openjdk21/distinfo:1.7
--- pkgsrc/lang/openjdk21/distinfo:1.6  Fri May 31 21:45:14 2024
+++ pkgsrc/lang/openjdk21/distinfo      Tue Oct  1 14:49:40 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2024/05/31 21:45:14 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2024/10/01 14:49:40 ryoon Exp $
 
 BLAKE2s (bootstrap-jdk-1.21.0.1.12-netbsd-9-aarch64-20231207.tar.xz) = a4e3fae37a90bcf53a842b94529aa46d5702785e0db27b2bcad0c692012f7953
 SHA512 (bootstrap-jdk-1.21.0.1.12-netbsd-9-aarch64-20231207.tar.xz) = 78563a04627e9cac7da620f4a888b6ad5ab4906cae4738ed4049495a7a07501a740af43557541e06c204503a581ac1be1f250195b3ba7fa882cdbfd09689e9bb
@@ -9,12 +9,12 @@ Size (bootstrap-jdk-1.21.0.1.12-netbsd-9
 BLAKE2s (bootstrap-jdk-1.21.0.1.12-netbsd-9-i386-20231207.tar.xz) = 6df557871e6795552305b28d778bcf8724b06e981ec72b35d2e5406cf1f25591
 SHA512 (bootstrap-jdk-1.21.0.1.12-netbsd-9-i386-20231207.tar.xz) = 15d1e8c3b9e440eb446857c42528d5d409baa6b173742930ec5dfe55ba1501e49af789ea75c8cc78eba6b977d7be2b2b4854d9657d75095c55d3941370ff7b94
 Size (bootstrap-jdk-1.21.0.1.12-netbsd-9-i386-20231207.tar.xz) = 111820092 bytes
-BLAKE2s (jdk21u-jdk-21.0.3-9-1.tar.gz) = 2efae827943e5ed7b5a338a6a6efc80a52cb5191f87d97b882c9730aa5635ed2
-SHA512 (jdk21u-jdk-21.0.3-9-1.tar.gz) = 39324a3355e27696777acf6827bb90493c7ae2734ea595a40cb328a8a68e0abebb8a872fb65f054ad6d60262d131e596498ec8e5ba74f942b011f116973233bc
-Size (jdk21u-jdk-21.0.3-9-1.tar.gz) = 112527752 bytes
+BLAKE2s (jdk21u-jdk-21.0.4-7-1.tar.gz) = 18dc01bcd79c17b21bfe1290dedd97f0b68a48eb23e00bbe1dc0663d90297d29
+SHA512 (jdk21u-jdk-21.0.4-7-1.tar.gz) = 887e4d8503a8d56ae57c51ca263780b5ed6fe061b469321d1775eeeff34511000d44e1b625179ca9584e1935ad1954ac8ef263aed6bbd5a7b763d1000e91153d
+Size (jdk21u-jdk-21.0.4-7-1.tar.gz) = 112633561 bytes
 SHA1 (patch-make_autoconf_build-performance.m4) = e03cdf61c60c15edd8383609354cbff6c7277d02
 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) = b3d70d7def7b4b0c4ae2632be75bfbe97f931879
 SHA1 (patch-make_autoconf_lib-alsa.m4) = 999fbf951363f6b49b22aad81537728f22d7c381
 SHA1 (patch-make_autoconf_lib-bundled.m4) = 6f4720cf9fcd9088e5e186940794b868e71dcc80

Index: pkgsrc/lang/openjdk21/patches/patch-make_autoconf_flags-cflags.m4
diff -u pkgsrc/lang/openjdk21/patches/patch-make_autoconf_flags-cflags.m4:1.1 pkgsrc/lang/openjdk21/patches/patch-make_autoconf_flags-cflags.m4:1.2
--- pkgsrc/lang/openjdk21/patches/patch-make_autoconf_flags-cflags.m4:1.1       Wed Nov 22 14:06:50 2023
+++ pkgsrc/lang/openjdk21/patches/patch-make_autoconf_flags-cflags.m4   Tue Oct  1 14:49:40 2024
@@ -1,30 +1,32 @@
-$NetBSD: patch-make_autoconf_flags-cflags.m4,v 1.1 2023/11/22 14:06:50 ryoon Exp $
+$NetBSD: patch-make_autoconf_flags-cflags.m4,v 1.2 2024/10/01 14:49:40 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

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index