From nobody Fri Nov 08 12:50:40 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XlJhK2N64z5chnB; Fri, 08 Nov 2024 12:50:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XlJhJ6N90z4Qs8; Fri, 8 Nov 2024 12:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731070240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OhXyNNiKcI47sTeLZV0QV9OgMssF83cLEnXuDQTE95M=; b=RKBeTkLBFzp2lWPnWQW4C7uOQHCrLfurBYBO1zsbStJPdz+pNUBzanT+6qx1Lw8FZmIWH3 owUUrNiae+abMQYztXoTFXU6JUFdEv1u7Iw2WWzHR15UXHKKaK5Oo0zZb4nTL2B3WdWCD3 mDc4RoFJNqOWLILb9P7DAUH58LP50lrG3LW0x3firP5qgjuGi8RaSSSGWvoChW6/c+iYDe MRnHPAJso+kzthqohc9QFp4nmgywH3XNaMTKNcaYRo17uzox5Qvx2bBywYvIj/wkFTd7Wr a4MW+smYDJ7AFICdVLlpruxVKd28TQS8tl1J0tsBIJwgBoh18JXD+GKzzbZPaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731070240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OhXyNNiKcI47sTeLZV0QV9OgMssF83cLEnXuDQTE95M=; b=iwguLwA0zWvuc5EZ+cuDjm11dX5zEhLnlDAZisy2YmYW3hG9V0ZbRrzAt3SqD/3RurX1Wi HsroWXkTGF+dcxDHu+UMF+kpTUxboPjMVZTaxVswyAIjCRj/Ve7Sb5OhLigBLz/wmizUyE jOBQR/33y8BIG0kuRVD+XlbWheMo7XQstMqxs5OHgva9DwcUUpJuTL+2pQS+YUUtShwPDE AhDQJtWjfaNvoDBFrhQHLT2odZU194nYmbxHGLXtWKff4j1uATs1GKH5ZJGUkpJ1nn1qrP 6kVWXOSnaagRJe3dDJ3I82Q+aiZK4gnK+Id+By1hBx/DlSJszJurY5kjy7RCCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731070240; a=rsa-sha256; cv=none; b=hpopkLLZhygA8pYk1Z3mfl1/KigtAwJJOOccJ1kuyhqzEAf1/QNXw5W+KoWYEGskjBmZ2Z bAVnZ0d0B7QEYBAGhTJFrYWqLKVRm4wT6MnOX+wX8FlR+wQBM39Confh5ancdlyc0vAenE 1tQ9O5IBK79l5MnIx83TmWz8CQJKCWwBKKvX901wwmwcJChdlETNvwztqetzfud/05aLiH +0GLlJsFptWQ792vV12C+uyqy5mMCxF/cHQT3Dp5pMQ9FNDW0PmFiZLPmppTiWwOVl57oX nLox3KtxIHPRqpPAupxUdVjfOffsuCoR0/TMcksu5mBHM5JFRBzYGqteFml/UA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XlJhJ5zfHzVkh; Fri, 8 Nov 2024 12:50:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A8CoegN032939; Fri, 8 Nov 2024 12:50:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A8CoeJ5032936; Fri, 8 Nov 2024 12:50:40 GMT (envelope-from git) Date: Fri, 8 Nov 2024 12:50:40 GMT Message-Id: <202411081250.4A8CoeJ5032936@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: b42fb59dbcf1 - main - java/openjdk11: fix build on 32 bit arm List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b42fb59dbcf15ee1dd8ca37b805f76671f0da8a1 Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=b42fb59dbcf15ee1dd8ca37b805f76671f0da8a1 commit b42fb59dbcf15ee1dd8ca37b805f76671f0da8a1 Author: MikaelUrankar AuthorDate: 2024-10-10 15:10:33 +0000 Commit: Ronald Klop CommitDate: 2024-11-08 12:49:33 +0000 java/openjdk11: fix build on 32 bit arm Slightly adjusted the patch of Mikael Urankar to make sure it only affects __arm__ builds. The patch is similar to what fixed openjdk8 in commit e13c81137266603a6a0700810b6bad419f9d98c8. Not bumping portrevision as nothing changes for existing pkgs. PR: 255662 Approved by: java@ (maintainer timeout) --- .../files/patch-make_hotspot_lib_CompileJvm.gmk | 11 ++++++++ .../patch-src_hotspot_os_bsd_os__perf__bsd.cpp | 30 ++++++++++++++++++++++ ...dk.hotspot.agent_bsd_native_libsaproc_libproc.h | 25 ++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/java/openjdk11/files/patch-make_hotspot_lib_CompileJvm.gmk b/java/openjdk11/files/patch-make_hotspot_lib_CompileJvm.gmk new file mode 100644 index 000000000000..65490ededb9d --- /dev/null +++ b/java/openjdk11/files/patch-make_hotspot_lib_CompileJvm.gmk @@ -0,0 +1,11 @@ +--- make/hotspot/lib/CompileJvm.gmk.orig 2024-10-04 16:07:55.502680000 +0200 ++++ make/hotspot/lib/CompileJvm.gmk 2024-10-04 16:07:03.672629000 +0200 +@@ -109,7 +109,7 @@ ifeq ($(call And, $(call isTargetOs, linux) $(call isT + ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, arm)), true) + JVM_EXCLUDE_PATTERNS += arm_64 + +-else ifeq ($(call And, $(call isTargetOs, bsd) $(call isTargetCpu, bsd-arm)), true) ++else ifeq ($(call And, $(call isTargetOs, bsd) $(call isTargetCpu, arm)), true) + JVM_EXCLUDE_PATTERNS += arm_64 + + else ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, aarch64)), true) diff --git a/java/openjdk11/files/patch-src_hotspot_os_bsd_os__perf__bsd.cpp b/java/openjdk11/files/patch-src_hotspot_os_bsd_os__perf__bsd.cpp new file mode 100644 index 000000000000..f6c770aee32b --- /dev/null +++ b/java/openjdk11/files/patch-src_hotspot_os_bsd_os__perf__bsd.cpp @@ -0,0 +1,30 @@ +This patch fixes the following error: + +In file included from jdk11u-jdk-11.0.24-8-1/src/hotspot/os/bsd/os_perf_bsd.cpp:47: +In file included from /usr/include/sys/user.h:51: +In file included from /usr/include/vm/pmap.h:88: +In file included from /usr/include/machine/pmap.h:48: +In file included from /usr/include/sys/systm.h:46: +/usr/include/machine/cpufunc.h:185:1: error: static declaration of 'breakpoint' follows non-static declaration + 185 | breakpoint(void) + | ^ +/usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/hotspot/share/utilities/breakpoint.hpp:31:17: note: previous declaration is here + 31 | extern "C" void breakpoint(); + + + +--- src/hotspot/os/bsd/os_perf_bsd.cpp.orig 2024-11-08 11:24:38 UTC ++++ src/hotspot/os/bsd/os_perf_bsd.cpp +@@ -43,6 +43,12 @@ + * with the same name. + */ + #define _MACHINE_PCB_H_ ++ /* ++ * do not redefine breakpoint on armv7 ++ */ ++ #ifdef __arm__ ++ #define _MACHINE_CPUFUNC_H_ ++ #endif + #endif + #include + #endif diff --git a/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_libproc.h b/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_libproc.h new file mode 100644 index 000000000000..f0abb17c22c9 --- /dev/null +++ b/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_libproc.h @@ -0,0 +1,25 @@ +This patch fixes the following error: + +In file included from /usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c:40: +In file included from /usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/libproc_impl.h:30: +/usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h:79:13: error: cannot combine with previous 'int' declaration specifier + 79 | typedef int bool; + | ^ +/usr/include/stdbool.h:37:14: note: expanded from macro 'bool' + 37 | #define bool _Bool + + +--- src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h.orig 2024-10-07 16:02:52.117023000 +0200 ++++ src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h 2024-10-07 16:02:15.020023000 +0200 +@@ -76,9 +76,11 @@ typedef int bool; + + // This C bool type must be int for compatibility with BSD calls and + // it would be a mistake to equivalence it to C++ bool on many platforms ++#if defined(__FreeBSD__) && defined(__arm__) && !defined(__bool_true_false_are_defined) + typedef int bool; + #define true 1 + #define false 0 ++#endif // __FreeBSD__ && __arm__ && !__bool_true_false_are_defined + + #endif // __APPLE__ +