Date: Tue, 19 Nov 2024 21:21:18 GMT From: Nuno Teixeira <eduardo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7cfcd90ff06a - main - devel/root: Unbreak FreeBSD 15 Message-ID: <202411192121.4AJLLIL5004726@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=7cfcd90ff06a60593b5b8498af3f555aeeb651cb commit 7cfcd90ff06a60593b5b8498af3f555aeeb651cb Author: Erik Jensen <erik@tenku.dk> AuthorDate: 2024-11-19 21:18:29 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> 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 = "";
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411192121.4AJLLIL5004726>