diff options
| author | Erik Jensen <erik@tenku.dk> | 2024-11-19 21:18:29 +0000 |
|---|---|---|
| committer | Nuno Teixeira <eduardo@FreeBSD.org> | 2024-11-19 21:23:11 +0000 |
| commit | 1704cd381b18c93c101085e1dee2a66222948405 (patch) | |
| tree | b0406296640533133eb80f041cedeea39887f3ab | |
| parent | d145ae7b5e34bb259b3027d5863dc69e749ab403 (diff) | |
| download | ports-1704cd381b18c93c101085e1dee2a66222948405.tar.gz ports-1704cd381b18c93c101085e1dee2a66222948405.zip | |
devel/root: Unbreak FreeBSD 15
PR: 282756
MFH: 2024Q4
(cherry picked from commit 7cfcd90ff06a60593b5b8498af3f555aeeb651cb)
| -rw-r--r-- | devel/root/Makefile | 4 | ||||
| -rw-r--r-- | devel/root/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 = ""; |