From nobody Sat Oct 12 11:12:58 2024 X-Original-To: dev-commits-ports-all@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 4XQgp21xQCz5ZCy2; Sat, 12 Oct 2024 11:12:58 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQgp21MRwz4b0K; Sat, 12 Oct 2024 11:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728731578; 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=j95VrpckCQFtTIU8xgR/q9hNVQgq7gRnDjYMK9GswC4=; b=AYuMZGit2rQeTwIGVZmmqwSKaG7Z9du9Xkien8sSdcPN8xXwG2UGWhCKn8LukZlS4aaxKC zCUvN+34o1lAt+IDJoMxjqDU3n53dJIg85A7LkJOAS7ZKW+y4ynRStF4I4mcCjOdryKgBV 2EifeEMv9XMKSNeQjZfJoSqH9WPGQ7CvUD9cZzorC+wJPpiQDrNn2r1G/56jm5y/cDaELa mP30wfyYUtRTenTtOdjfvOkg3fik0cMBpnNLvZfoWCyun0uLa2G/dOFrZ+UiSubHzGp1iw +3FkwV3XVG5Am5F3NS2oNYqIcPZSUlhC7n6VDklCbHICxSWO+F1GLiDqy4nRgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728731578; 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=j95VrpckCQFtTIU8xgR/q9hNVQgq7gRnDjYMK9GswC4=; b=VNwO5khkMrak/ZYkSI53zS4rrSRI++Jxa48KcZXSCxze431nwqbnppe6ZC1HIVQSw+IJVB W/IJEvoFWhaM9zMCwwcDCSwzde1nmy1+2sGYdTHN49ExzyHR8HJY3n1yFyBEBDh4+PrZ+R In8WqMWDWYSe8xb7Ug4xlTDO+QlwNMyfI7qotLmKdaCsnkCiIKYFXwgYAII37fPITWaY2z b8JYGEye/O+cLtXzgW+pwe/YIBXlgWXgxrfWTivCRwqRSaOsRyoS5qbDxLMRw2OiNl65dT Smd6bwQUe5+uR66XpPtiOF19JpnUURz+FWeZIqzSLENy+WARQlJBdjUcDbnwbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728731578; a=rsa-sha256; cv=none; b=R4qJWtYXJzuWfrTz5Z2vUXLySBl2o8wa5POeEUXx/hJC/MH9/o1vra34L/L08uMluk/wi8 aGRu48R7BBKIdsxuH71NxsFrtzO1H/RLR83dEHZ7KljYsZVLfX1IPmHPDlGCaVvK0puXew ew4DqqafpC9y3S2rdfFPz/SgzkwG4W4xQVakBXbbKaG8IAxD5wok+XM7Rx2K71LagD9e8U z/R35WVnEbaJFUsGqA+vP3KR/LUQZzLNrr9VgU6iI4vN9jHpEa2rGMSub0YWJ0lD5TUGB4 hW192NASOZmWz053oT4m1W9/mfwaN7SbB/dtVkS4LgTQFaDhuz+SIiogbUnCNQ== 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 4XQgp20vNYz1N3t; Sat, 12 Oct 2024 11:12:58 +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 49CBCwQ2055346; Sat, 12 Oct 2024 11:12:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CBCwma055343; Sat, 12 Oct 2024 11:12:58 GMT (envelope-from git) Date: Sat, 12 Oct 2024 11:12:58 GMT Message-Id: <202410121112.49CBCwma055343@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Ronald Klop Subject: git: 23aba7204c39 - 2024Q4 - java/openjdk8: fix build on 32 bit arm List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 23aba7204c39589899e397b166f170b27653f042 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=23aba7204c39589899e397b166f170b27653f042 commit 23aba7204c39589899e397b166f170b27653f042 Author: Mikael Urankar AuthorDate: 2024-10-10 15:12:51 +0000 Commit: Ronald Klop CommitDate: 2024-10-12 11:12:37 +0000 java/openjdk8: fix build on 32 bit arm Fixes: In file included from /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/os/bsd/vm/os_perf_bsd.cpp:61: 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:184:1: error: static declaration of 'breakpoint' follows non-static declaration 184 | breakpoint(void) | ^ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp:224:17: note: previous declaration is here 224 | extern "C" void breakpoint(); | ^ - bumped portrevision to easily spot if future bug reports are about this change. PR: 281991 Approved by: early maintainer timeout java@ (the build is broken and the patch does not affect other architectures) Obtained from: Mikael Urankar via Attachment 254105 in bug #255662 (cherry picked from commit e13c81137266603a6a0700810b6bad419f9d98c8) --- java/openjdk8/Makefile | 2 +- .../files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 1b9f0a35ea3d..7b32985fd649 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -1,6 +1,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= LOCAL/jkim:jtreg PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} diff --git a/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp b/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp new file mode 100644 index 000000000000..3cefb5553df4 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp @@ -0,0 +1,15 @@ +--- hotspot/src/os/bsd/vm/os_perf_bsd.cpp.orig 2024-10-10 08:36:27 UTC ++++ hotspot/src/os/bsd/vm/os_perf_bsd.cpp +@@ -57,6 +57,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