From bbab7f59e9630416397189df70ec133bdd690e38 Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Sat, 30 Sep 2023 22:44:19 +0200 Subject: */*: Sunset 12.4-RELEASE/12-STABLE from ports tree - Remove all references to defunct ARCH arm - Remove all references to defunct ARCH sparc64 - Remove x11-drivers/xf86-video-sunffb which requires defunct sparc64 ARCH - Remove sysutils/afbinit requires defunct sparc64 ARCH - Remove all references to bktr driver - Remove all references to defunct FreeBSD_12 - Remove all references to OSVERSION/OSREL corresponding to 12 - Remove conditionals in Mk/Uses/cabal.mk - Remove sparc reference from Mk/Uses/qt-dist.mk - Remove BROKEN_sparc64/NOT_FOR_ARCH=sparc64 - Remove BROKEN_FreeBSD_12* from: - Remove OpenSSL patches from: - Remove conditional flags for OSVERSION >= 1300000 to fixed flags. Also move conditional flags for non sparc64/arm ARCH to fixed flags. Reviewed by: brooks, jbeich, rene, salvadore Differential Revision: https://reviews.freebsd.org/D42068 --- java/openjdk17/Makefile | 3 --- .../extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp | 11 ----------- 2 files changed, 14 deletions(-) delete mode 100644 java/openjdk17/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp (limited to 'java/openjdk17') diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index 61701adf8eda..5f2fc749ac09 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -158,9 +158,6 @@ CONFIGURE_ARGS+= --disable-warnings-as-errors .if ${ARCH} == aarch64 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv1) CONFIGURE_ARGS+= --disable-dtrace .endif -.if ${ARCH} == powerpc64 && ${OSREL:C/\.[0-9]//} == 12 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp -.endif .if ${ARCH} == aarch64 CONFIGURE_ARGS+= --with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers MAKE_ENV+= JAVA_TOOL_OPTIONS="-XX:-UseCompressedClassPointers" diff --git a/java/openjdk17/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp b/java/openjdk17/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp deleted file mode 100644 index 1722d87b9665..000000000000 --- a/java/openjdk17/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/hotspot/cpu/ppc/vm_version_ppc.hpp.orig 2019-10-16 11:31:09.000000000 -0700 -+++ src/hotspot/cpu/ppc/vm_version_ppc.hpp 2019-10-23 12:54:06.972903000 -0700 -@@ -108,7 +108,7 @@ - static bool has_lqarx() { return (_features & lqarx_m) != 0; } - static bool has_vcipher() { return (_features & vcipher_m) != 0; } - static bool has_vpmsumb() { return (_features & vpmsumb_m) != 0; } -- static bool has_mfdscr() { return (_features & mfdscr_m) != 0; } -+ static bool has_mfdscr() { return false; } - static bool has_vsx() { return (_features & vsx_m) != 0; } - static bool has_ldbrx() { return (_features & ldbrx_m) != 0; } - static bool has_stdbrx() { return (_features & stdbrx_m) != 0; } -- cgit v1.2.3