From nobody Tue Nov 19 22:01:23 2024 X-Original-To: dev-commits-ports-branches@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 4XtJNg4Pl3z5cmKq; Tue, 19 Nov 2024 22:01:23 +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 4XtJNg30J1z4sQN; Tue, 19 Nov 2024 22:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732053683; 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=MFzJp6GXwCI7uZsS++WdhNWZcxz9l/y4I43MMdipzOc=; b=mEOXiYMLsh8byptF+sMpryIZmzJL0Pzm5sCdez9Fobr0nfVsGlnq5Z+muU3Rxx1X8TaYxk hpOeNNaOjNHMjfS4LpmASjNqBhKXXx+DP7Klab9WIvP6U1EU/hOLeFNq74W/lqqEgtBAUA ZaX7pLFTAoyTsyWGHc8cTqQYTNYMTBiivNM9we5VPco/H7Yb2QK+ISMZAup7vpTtNlzsRM SU4njn0NVMYvLWOpjD6sRW1/EDcMeam6JyezD+KlbAmLkvp5sfjEbpY6RycwoP0my3qrqB GTZ9d//SeM2L/+8RF1I9rhoydh5zCEX4zO/O8BKsephHy3el/KO8okvsSuJp4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732053683; 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=MFzJp6GXwCI7uZsS++WdhNWZcxz9l/y4I43MMdipzOc=; b=mX3uh7mwBiSKAY+k+a1sAII1kcN4h/dJ1bipmbGUR1+TfS80oyFTofRokObCGmJKS0/hyp 5M+yU2QbR3FFal8qkhmt9du2MJe/hHQOxe6I8vpShwswO1aAKEslTzxWElRSC3WGqL6G0E hAXP9bkib+50ZzML1tjxzI10iP7qVCgY6QyfxxjhN30ldUpoFhkASreX6ZAg95P663Ii44 OXBcwJbf1rIjfZgtefC5i5P0Q/R50ebalSCjZhqNgNj4iWWrRtbimN3j1BkpGfCTNXJ94v DFoDXxW10LPKeXrCGxPQA0b7gHI5C5n9TOkphzRPoNMkM05idDFTg+42C7qjXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732053683; a=rsa-sha256; cv=none; b=wVarEmwjkktgkgsj6EMNfte6UiejfSgMPFDx2JNShSsvfzhfLsBaQx3L+TwBpYm0KYIKXe E6Vp4RpdTu4m6NHEBqHUVIULXTZKqxkcEo2/9+plmjGZDACFAv5GaSkffEKyf5cUdxPBM6 PCaQ48akENNvUcmS4FQNC5Y56ysKmSxAcvBBqpI4U90LDIK9ntG5SF62LTyIFeP68xwHeJ QGmNIbaL0gIjI763Z3batZpdF8woEOV2K1nyV/aB4RI3+SMVaklNFc2XEcjR52H8c6aAdl uAXRgX/nxxgp0+i5KG6LBrJUAWO4J6geQB+WHcLJDHDdkCrHGnYY7b6oXWwoxQ== 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 4XtJNg2bmrzSFT; Tue, 19 Nov 2024 22:01:23 +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 4AJM1NI9078322; Tue, 19 Nov 2024 22:01:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJM1NOG078319; Tue, 19 Nov 2024 22:01:23 GMT (envelope-from git) Date: Tue, 19 Nov 2024 22:01:23 GMT Message-Id: <202411192201.4AJM1NOG078319@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 1704cd381b18 - 2024Q4 - devel/root: Unbreak FreeBSD 15 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 1704cd381b18c93c101085e1dee2a66222948405 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=1704cd381b18c93c101085e1dee2a66222948405 commit 1704cd381b18c93c101085e1dee2a66222948405 Author: Erik Jensen AuthorDate: 2024-11-19 21:18:29 +0000 Commit: Nuno Teixeira CommitDate: 2024-11-19 21:23:11 +0000 devel/root: Unbreak FreeBSD 15 PR: 282756 MFH: 2024Q4 (cherry picked from commit 7cfcd90ff06a60593b5b8498af3f555aeeb651cb) --- 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 = "";