From nobody Tue Nov 19 21:21:18 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 4XtHVR298nz5fS7Q; Tue, 19 Nov 2024 21:21:19 +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 4XtHVR11CVz4qVH; Tue, 19 Nov 2024 21:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732051279; 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=uxayvz79dIEjQzUX09jBsNbTHCip+HZXK8DMS6mrPBw=; b=BPAN5EjpjsI/NjhCyaNZiSeaMfSHJS++1z29Pc/jSrpoFReauDrepRHLeZcsYJ9vAgcZMP lzzqoTl+sebTXNfQDvJzFPHo7OhrLnduizXEAVAu48IluRhTfnesOE0SNFnc/warujbHX/ EM5I1jOW417LdrXpd7BNyP5ji/D5ah1YUdFHe3vAeKLjFVjvd5RGXIcRQQrTgtC3MMuVVw ki+D3lq12QHIa2Z4yhqCbzDCCxrHYMIKqw7vLoudvu1R+EqQk1k4vL+nAqrN0zLK1NUFUf iLq47mW26cd66QM096RJ6zW4tBQSXPwqpOMiI1mGa1LGCOcmskxnqqeIEbmnvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732051279; 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=uxayvz79dIEjQzUX09jBsNbTHCip+HZXK8DMS6mrPBw=; b=x6Sh1nPHdjS0U7eq0okcuzGbh2wZM/D6zFaSYsrdfQSWLuRbZv+mPvmhuOca+bANu6C0pU d8XfXiacYmo3lJfObUyF6UxXS8kH7pYsQptG2SiBlvooLqCRcELi8yU/CUc1Nt6tIYrcsg GRIYoKhb5MeOMM5kWAirBcjiIiPCMU5TcQEU+n6ojaQEi98gf9mnkKxPwrFHYsrS4f0AYm 8tpAJT3qXTunj1k+TuKKdhbWW5GThSubviIO0XJ9VafhNKRJ/TGucUm2xSuqX1A1Cx6zRj +Fqjvv9HrxHmFOfpGPq8HwNubFVUfrZSkaYmGjH76fbTIaD/zkNDHFwu15R+nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732051279; a=rsa-sha256; cv=none; b=R1MWZRfI1Tet+VHnFr3DOieujRNlOCvf6kU998c3Nq/AbXpTps/SNz0lhWHDv6ZcttZq1a JQ2K4nXNBp0w15MCk3WEhdtvaSNa+mSU2u5fxPZ4UaMaQpdCbSMNJACkB02yKBWEzxWEl5 D5hQb4ZnSO1zwXxGfh+fSsJnjSxBfdMM92aIziM1tvd8BMxcjg1KyLxY4Zqx4B5e0ljvs1 TLHUzSf03OUje4OmvJ3LrdC5T7hBIBrWdpCJWVJcStEbOslB9AGLTYP1XB4VB4ZWjD8jRw Vvlp4zx/E+IvEZrp6A7UgAMpOroogxUhRDNDILoFPdUenmrb4q/9P8aFY3xAMA== 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 4XtHVR0dhKzRJt; Tue, 19 Nov 2024 21:21:19 +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 4AJLLIHe004729; Tue, 19 Nov 2024 21:21:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJLLIL5004726; Tue, 19 Nov 2024 21:21:18 GMT (envelope-from git) Date: Tue, 19 Nov 2024 21:21:18 GMT Message-Id: <202411192121.4AJLLIL5004726@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 7cfcd90ff06a - main - devel/root: Unbreak FreeBSD 15 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cfcd90ff06a60593b5b8498af3f555aeeb651cb Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=7cfcd90ff06a60593b5b8498af3f555aeeb651cb commit 7cfcd90ff06a60593b5b8498af3f555aeeb651cb Author: Erik Jensen AuthorDate: 2024-11-19 21:18:29 +0000 Commit: Nuno Teixeira CommitDate: 2024-11-19 21:21:06 +0000 devel/root: Unbreak FreeBSD 15 PR: 282756 MFH: 2024Q4 --- devel/root/Makefile | 4 +--- .../files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/devel/root/Makefile b/devel/root/Makefile index aa522d8bf1f1..f3c04be51953 100644 --- a/devel/root/Makefile +++ b/devel/root/Makefile @@ -1,6 +1,6 @@ PORTNAME= root DISTVERSION= 6.32.04 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel science math parallel python MASTER_SITES= https://root.cern/download/ DISTFILES= ${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX} @@ -12,8 +12,6 @@ WWW= https://root.cern/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LGPL2_1.txt -BROKEN_FreeBSD_15= fails to build: Patch for newest CURRENT is missing - BUILD_AND_RUN_DEPENDS= bash:shells/bash \ nlohmann-json>=3:devel/nlohmann-json BUILD_DEPENDS= ${BUILD_AND_RUN_DEPENDS} diff --git a/devel/root/files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp b/devel/root/files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp index 68226edcbcfb..7afbaa8d87f7 100644 --- a/devel/root/files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp +++ b/devel/root/files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp @@ -5,8 +5,8 @@ #else const char* LinkageCxx = Linkage; +#ifdef __FreeBSD__ -+// atexit-like commands need 'throw()' specifier on FreeBSD 15 aarch64 -+#if defined(__aarch64__) && __FreeBSD_cc_version >= 1500000 ++// atexit-like commands need 'throw()' specifier on FreeBSD 15 ++#if __FreeBSD_cc_version >= 1500000 + const char* Attr = " throw () "; +#else const char* Attr = "";