pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang
Module Name: pkgsrc
Committed By: tnn
Date: Mon Dec 4 01:08:17 UTC 2023
Modified Files:
pkgsrc/lang/openjdk11: distinfo
pkgsrc/lang/openjdk17: distinfo
pkgsrc/lang/openjdk21: distinfo
pkgsrc/lang/openjdk8: distinfo
pkgsrc/lang/openjdk8/patches:
patch-common_autoconf_generated-configure.sh
Added Files:
pkgsrc/lang/openjdk11/patches: patch-make_autoconf_build-performance.m4
pkgsrc/lang/openjdk17/patches: patch-make_autoconf_build-performance.m4
pkgsrc/lang/openjdk21/patches: patch-make_autoconf_build-performance.m4
Log Message:
openjdk*: try hw.physmem64 before hw.physmem in configure
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/lang/openjdk11/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/lang/openjdk11/patches/patch-make_autoconf_build-performance.m4
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/openjdk17/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/lang/openjdk17/patches/patch-make_autoconf_build-performance.m4
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/openjdk21/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/lang/openjdk21/patches/patch-make_autoconf_build-performance.m4
cvs rdiff -u -r1.99 -r1.100 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r1.23 -r1.24 \
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/openjdk11/distinfo
diff -u pkgsrc/lang/openjdk11/distinfo:1.40 pkgsrc/lang/openjdk11/distinfo:1.41
--- pkgsrc/lang/openjdk11/distinfo:1.40 Thu Nov 23 15:33:19 2023
+++ pkgsrc/lang/openjdk11/distinfo Mon Dec 4 01:08:16 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2023/11/23 15:33:19 ryoon Exp $
+$NetBSD: distinfo,v 1.41 2023/12/04 01:08:16 tnn Exp $
BLAKE2s (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = f93572f551f242344e5d6d5e46b9812e5b426772842b5fa06fea4422e327c871
SHA512 (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) =
c4030c99e4c1bb209f0c1ca6c10665c3f4c906f9d7dc13b912c3fbb8031f3dbb6f8d2e5e966cbbc452c307ba5d6de816c0f000b5b7c5d4e3fe8511baf12aab49
@@ -15,6 +15,7 @@ Size (bootstrap-jdk-1.11.0.7.10-netbsd-9
BLAKE2s (jdk11u-jdk-11.0.21-9-1.tar.gz) = a0293421abd167f192499d560abf11b4c0077734a990380643608bc570009025
SHA512 (jdk11u-jdk-11.0.21-9-1.tar.gz) = 79839637e3ca057c4ee833cb56467fc1876569d5f98fd20cb03c371828f732ca1b8dd26b1656779f01a0b06ac4266c9a24fbf1bd54e5ca3daf93baae12ed4ac2
Size (jdk11u-jdk-11.0.21-9-1.tar.gz) = 116433451 bytes
+SHA1 (patch-make_autoconf_build-performance.m4) = d52cb5897e9fb6e3b0cdbe34641d8caa218b21b7
SHA1 (patch-make_autoconf_buildjdk-spec.gmk.in) = d0b600237853c17ecc2864604f0bd847ba6b0149
SHA1 (patch-make_autoconf_flags-cflags.m4) = 3b37853298805e2ffb92d3babd700d0048f24d8d
SHA1 (patch-make_autoconf_hotspot.m4) = 437c8b09114933cca22c4a847a90a415cd113e5a
Index: pkgsrc/lang/openjdk17/distinfo
diff -u pkgsrc/lang/openjdk17/distinfo:1.15 pkgsrc/lang/openjdk17/distinfo:1.16
--- pkgsrc/lang/openjdk17/distinfo:1.15 Sun Nov 26 10:48:46 2023
+++ pkgsrc/lang/openjdk17/distinfo Mon Dec 4 01:08:16 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2023/11/26 10:48:46 tnn Exp $
+$NetBSD: distinfo,v 1.16 2023/12/04 01:08:16 tnn 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
@@ -15,6 +15,7 @@ Size (bootstrap-jdk-1.17.0.3.7-netbsd-9-
BLAKE2s (jdk17u-jdk-17.0.9-9-1.tar.gz) = a16b75771899e552e2fe247a14f5aaddfa3e454f14e1edffbfd1312d5ed950ef
SHA512 (jdk17u-jdk-17.0.9-9-1.tar.gz) = a9ebd92601f6f0aea22940446a52c0c58e1af4d1238e03e58d7e062741780d6f0b8fac611cd1c3230cd3511c494dbda4d073f39ec205b761af7abbba58855f09
Size (jdk17u-jdk-17.0.9-9-1.tar.gz) = 106526772 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_hotspot.m4) = 6370c6cb2a3f225c502e7916342104cf1288f4cf
Index: pkgsrc/lang/openjdk21/distinfo
diff -u pkgsrc/lang/openjdk21/distinfo:1.1 pkgsrc/lang/openjdk21/distinfo:1.2
--- pkgsrc/lang/openjdk21/distinfo:1.1 Wed Nov 22 14:06:50 2023
+++ pkgsrc/lang/openjdk21/distinfo Mon Dec 4 01:08:16 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2023/11/22 14:06:50 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2023/12/04 01:08:16 tnn Exp $
BLAKE2s (bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231119.tar.xz) = 47d3cc141e09afd2cd743db75d74e619efa133828d279ec24948e709a95a6d58
SHA512 (bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231119.tar.xz) = 297f85ed4d12f7c87472181f814de927d2b4311aa917d00bcbf666b793b30dc72a08ae3cc6e4b95882e33dade127bed6b34f06399aeed8dfd5cf82800b6fec29
@@ -6,6 +6,7 @@ Size (bootstrap-jdk-1.21.0.1.12-netbsd-9
BLAKE2s (jdk21u-jdk-21.0.1-12-1.tar.gz) = c3abe0e4b514aa4a6d1fe884693255ff151c052d9e3b87cdf60803f2fc2c89f0
SHA512 (jdk21u-jdk-21.0.1-12-1.tar.gz) = 5b81a5aea60714ebd58ce1557ea976ef8e287a042d5972297f2a937667b8b0307362669d6d9a102e397d04f78df0e31c50f6de16956eeecee5d3996f05284ee5
Size (jdk21u-jdk-21.0.1-12-1.tar.gz) = 112374315 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_hotspot.m4) = b3d70d7def7b4b0c4ae2632be75bfbe97f931879
Index: pkgsrc/lang/openjdk8/distinfo
diff -u pkgsrc/lang/openjdk8/distinfo:1.99 pkgsrc/lang/openjdk8/distinfo:1.100
--- pkgsrc/lang/openjdk8/distinfo:1.99 Thu Nov 23 15:32:42 2023
+++ pkgsrc/lang/openjdk8/distinfo Mon Dec 4 01:08:16 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.99 2023/11/23 15:32:42 ryoon Exp $
+$NetBSD: distinfo,v 1.100 2023/12/04 01:08:16 tnn 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) = df07bc97a90b332e5073618d94064fe68be41a3d
+SHA1 (patch-common_autoconf_generated-configure.sh) = 8a0158cb39ae3aa8afecda35feface062a2b610b
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.23 pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.24
--- pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh:1.23 Mon Jul 31 15:01:25 2023
+++ pkgsrc/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh Mon Dec 4 01:08:16 2023
@@ -1,6 +1,6 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.23 2023/07/31 15:01:25 ryoon Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.24 2023/12/04 01:08:16 tnn Exp $
---- common/autoconf/generated-configure.sh.orig 2023-07-19 02:06:20.000000000 +0000
+--- common/autoconf/generated-configure.sh.orig 2023-10-18 04:28:25.000000000 +0000
+++ common/autoconf/generated-configure.sh
@@ -4202,7 +4202,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi
# These toolchains are valid on different platforms
@@ -282,7 +282,7 @@ $NetBSD: patch-common_autoconf_generated
# This is not a symbolic link! We are done!
break
fi
-@@ -42372,6 +42368,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -42401,6 +42397,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
SET_SHARED_LIBRARY_MAPFILE=''
@@ -295,7 +295,7 @@ $NetBSD: patch-common_autoconf_generated
else
# Default works for linux, might work on other platforms as well.
SHARED_LIBRARY_FLAGS='-shared'
-@@ -42443,7 +42445,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -42472,7 +42474,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
if test "x$OPENJDK_TARGET_OS" = xsolaris; then
CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
@@ -306,7 +306,7 @@ $NetBSD: patch-common_autoconf_generated
fi
# The (cross) compiler is now configured, we can now test capabilities
# of the target platform.
-@@ -42603,7 +42607,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -42632,7 +42636,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
elif test "x$TOOLCHAIN_TYPE" = xgcc; then
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
@@ -315,7 +315,7 @@ $NetBSD: patch-common_autoconf_generated
LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
fi
-@@ -43462,7 +43466,9 @@ $as_echo "$supports" >&6; }
+@@ -43491,7 +43495,9 @@ $as_echo "$supports" >&6; }
# Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
# java heap.
if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
@@ -326,7 +326,7 @@ $NetBSD: patch-common_autoconf_generated
fi
fi
fi
-@@ -43950,7 +43956,8 @@ $as_echo "alsa pulse x11" >&6; }
+@@ -43979,7 +43985,8 @@ $as_echo "alsa pulse x11" >&6; }
if test "x$OPENJDK_TARGET_OS" = xbsd; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5
$as_echo_n "checking what is not needed on BSD?... " >&6; }
@@ -336,7 +336,7 @@ $NetBSD: patch-common_autoconf_generated
ALSA_NOT_NEEDED=yes
PULSE_NOT_NEEDED=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
-@@ -45180,7 +45187,7 @@ $as_echo "$as_me: WARNING: Can't find pr
+@@ -45209,7 +45216,7 @@ $as_echo "$as_me: WARNING: Can't find pr
BUILD_FREETYPE=no
fi
# Now check if configure found a version of 'msbuild.exe'
@@ -345,7 +345,7 @@ $NetBSD: patch-common_autoconf_generated
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&5
$as_echo "$as_me: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&2;}
BUILD_FREETYPE=no
-@@ -45619,6 +45626,10 @@ $as_echo "$as_me: WARNING: --with-freety
+@@ -45648,6 +45655,10 @@ $as_echo "$as_me: WARNING: --with-freety
# Allow --with-freetype-lib and --with-freetype-include to override
if test "x$with_freetype_include" != x; then
POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
@@ -356,7 +356,7 @@ $NetBSD: patch-common_autoconf_generated
fi
if test "x$with_freetype_lib" != x; then
POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
-@@ -48937,7 +48948,7 @@ $as_echo "$as_me: The path of FREETYPE_I
+@@ -48966,7 +48977,7 @@ $as_echo "$as_me: The path of FREETYPE_I
FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
fi
@@ -365,7 +365,7 @@ $NetBSD: patch-common_autoconf_generated
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
else
FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
-@@ -49081,7 +49092,7 @@ $as_echo "$as_me: The path of FREETYPE_L
+@@ -49110,7 +49121,7 @@ $as_echo "$as_me: The path of FREETYPE_L
if test "x$OPENJDK_TARGET_OS" = xwindows; then
FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
else
@@ -374,7 +374,7 @@ $NetBSD: patch-common_autoconf_generated
fi
fi
-@@ -50416,9 +50427,6 @@ fi
+@@ -50445,9 +50456,6 @@ fi
@@ -384,7 +384,7 @@ $NetBSD: patch-common_autoconf_generated
llvm_components="jit mcjit engine nativecodegen native"
unset LLVM_CFLAGS
-@@ -50461,7 +50469,7 @@ fi
+@@ -50490,7 +50498,7 @@ fi
fi
# libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
@@ -393,3 +393,12 @@ $NetBSD: patch-common_autoconf_generated
LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
fi
+@@ -55474,7 +55482,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
+- MEMORY_SIZE=`/sbin/sysctl -n hw.physmem`
++ MEMORY_SIZE=`/sbin/sysctl -n hw.physmem64 || /sbin/sysctl -n hw.physmem`
+ MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
+ FOUND_MEM=yes
+ elif test "x$OPENJDK_BUILD_OS" = xwindows; then
Added files:
Index: pkgsrc/lang/openjdk11/patches/patch-make_autoconf_build-performance.m4
diff -u /dev/null pkgsrc/lang/openjdk11/patches/patch-make_autoconf_build-performance.m4:1.1
--- /dev/null Mon Dec 4 01:08:17 2023
+++ pkgsrc/lang/openjdk11/patches/patch-make_autoconf_build-performance.m4 Mon Dec 4 01:08:16 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-make_autoconf_build-performance.m4,v 1.1 2023/12/04 01:08:16 tnn Exp $
+
+try hw.physmem64 before hw.physmem
+
+--- make/autoconf/build-performance.m4.orig 2023-12-04 00:31:51.317110114 +0000
++++ make/autoconf/build-performance.m4
+@@ -83,7 +83,7 @@ AC_DEFUN([BPERF_CHECK_MEMORY_SIZE],
+ FOUND_MEM=yes
+ elif test -x /sbin/sysctl; then
+ # Looks like a BSD system
+- MEMORY_SIZE=`/sbin/sysctl -n hw.physmem`
++ MEMORY_SIZE=`/sbin/sysctl -n hw.physmem64 || /sbin/sysctl -n hw.physmem`
+ MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
+ FOUND_MEM=yes
+ if test "x$OPENJDK_TARGET_OS_ENV" = xbsd.openbsd; then
Index: pkgsrc/lang/openjdk17/patches/patch-make_autoconf_build-performance.m4
diff -u /dev/null pkgsrc/lang/openjdk17/patches/patch-make_autoconf_build-performance.m4:1.1
--- /dev/null Mon Dec 4 01:08:17 2023
+++ pkgsrc/lang/openjdk17/patches/patch-make_autoconf_build-performance.m4 Mon Dec 4 01:08:16 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-make_autoconf_build-performance.m4,v 1.1 2023/12/04 01:08:16 tnn Exp $
+
+try hw.physmem64 before hw.physmem
+
+--- make/autoconf/build-performance.m4.orig 2023-12-04 00:30:37.764651646 +0000
++++ make/autoconf/build-performance.m4
+@@ -84,7 +84,7 @@ AC_DEFUN([BPERF_CHECK_MEMORY_SIZE],
+ FOUND_MEM=yes
+ elif test -x /sbin/sysctl; then
+ # Looks like a BSD system
+- MEMORY_SIZE=`/sbin/sysctl -n hw.physmem`
++ MEMORY_SIZE=`/sbin/sysctl -n hw.physmem64 || /sbin/sysctl -n hw.physmem`
+ MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
+ FOUND_MEM=yes
+ if test "x$OPENJDK_TARGET_OS_ENV" = xbsd.openbsd; then
Index: pkgsrc/lang/openjdk21/patches/patch-make_autoconf_build-performance.m4
diff -u /dev/null pkgsrc/lang/openjdk21/patches/patch-make_autoconf_build-performance.m4:1.1
--- /dev/null Mon Dec 4 01:08:17 2023
+++ pkgsrc/lang/openjdk21/patches/patch-make_autoconf_build-performance.m4 Mon Dec 4 01:08:16 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-make_autoconf_build-performance.m4,v 1.1 2023/12/04 01:08:16 tnn Exp $
+
+try hw.physmem64 before hw.physmem
+
+--- make/autoconf/build-performance.m4.orig 2023-12-04 00:28:42.456589322 +0000
++++ make/autoconf/build-performance.m4
+@@ -73,7 +73,7 @@ AC_DEFUN([BPERF_CHECK_MEMORY_SIZE],
+ FOUND_MEM=yes
+ elif test -x /sbin/sysctl; then
+ # Looks like a BSD system
+- MEMORY_SIZE=`/sbin/sysctl -n hw.physmem`
++ MEMORY_SIZE=`/sbin/sysctl -n hw.physmem64 || /sbin/sysctl -n hw.physmem`
+ MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
+ FOUND_MEM=yes
+ if test "x$OPENJDK_TARGET_OS_ENV" = xbsd.openbsd; then
Home |
Main Index |
Thread Index |
Old Index