From nobody Fri Oct 11 11:55:36 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 4XQ4nh6kxYz5Ymmn; Fri, 11 Oct 2024 11:55:36 +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 4XQ4nh6F9Xz4Qc5; Fri, 11 Oct 2024 11:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728647736; 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=DS2OW82AzyGPPtfSPZMSHVu+XPQer2MaI6eBcEflQNs=; b=BDE90GD21BGX4bhTOdU5BUWWNk7aV+ALCtLt10X3esYgAuSevMK/LzfxebV4QjXNcCf7CG aY9+5nQuUALmp/BNi5NCJiHizsxql+pGGrE8IVBPhj+SKLvpQRIdNjRHbDdB513+RCBzpz ww9mJ1Jpj6Ngr/bV8DJ1c2a8TsIgBl5KOJHaG4cMvU5QcmBR5YOsfDwvbWVFGr0z+YrGl+ 5JA84+XDIuQg2TFGOwJDvUTwOBrUcyQnGLEnxNUuabCrt3BSxq3eXFLgPzlsqOnzxoxLNK SVl/ZqO4JcnVk15TpATUPW1vSoLLY3xEr3xKz91ti/Ny4GxJxCtCabCLhGPUaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728647736; 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=DS2OW82AzyGPPtfSPZMSHVu+XPQer2MaI6eBcEflQNs=; b=cZn9NXWdQ/x0U3N9af2PMwNNBcIlwhqkPn7UolB2aNMGu3kZdgF8UOpv2orPCvqFns5oqw EEarN7ky5sWq1746g9G3tQ+YfCVJLDVhdGKzkpg490WfhSgTEKMBm8S+09xvkwdZAr16yV bsJVUZ4Vg8fhAupIAFrFcKCG+BA2fCcvuKF3JvZnH9JsnUwuRgfu0S24akfHgBbsE+EPq2 DnYa23Av6qv9iFUGci3yLjyp7heW4AuIo/CmNSKH35IQN99wU/gRPsbhdOV39+D7YGm4x0 8LLR+Rv4C9fDGseGkYbROycM6Jn+bOiq/a9o7U4jVJ4uIQx5P8Jg9I/ASV/c8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728647736; a=rsa-sha256; cv=none; b=MRWrUbXoCh9ekmLhZb2/xqw7sVw/KC6ZZYrIcqviuF5zpASk+6e5lB2QU8q95prQl1lLft eV9SrSmJ74d8Gx0E/USTIpHif+4dV3kh1Qv0cL65XG2U7jxDVK46eSFmttVmUvZB41DCPm LGWOKof9O9rtLd7SQZAnUw5U3srm2oUsnvrjk4YdsE8Lw7FG5uLHiNgENerkViSq3o8gxd oNU1ea8uAC0s79p3WkZOLvh7eyEcSW8SmnJxgzzvEKNdeSaJDAuWDphi32wE4rPg2ka3Vd H+sTKFtKvi1evfmSvKX9chtBn0+VSeXGnkOY/F+FbLxN+iINrUN8zOUh1d9mJg== 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 4XQ4nh5QKNzgXs; Fri, 11 Oct 2024 11:55:36 +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 49BBtaIr081156; Fri, 11 Oct 2024 11:55:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BBtasZ081153; Fri, 11 Oct 2024 11:55:36 GMT (envelope-from git) Date: Fri, 11 Oct 2024 11:55:36 GMT Message-Id: <202410111155.49BBtasZ081153@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: e13c81137266 - main - 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/main X-Git-Reftype: branch X-Git-Commit: e13c81137266603a6a0700810b6bad419f9d98c8 Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=e13c81137266603a6a0700810b6bad419f9d98c8 commit e13c81137266603a6a0700810b6bad419f9d98c8 Author: Mikael Urankar AuthorDate: 2024-10-10 15:12:51 +0000 Commit: Ronald Klop CommitDate: 2024-10-11 11:55:05 +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 --- 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