Attachment #251095 for bug #278110

Lines 1-5 Link Here

(-)b/devel/root/Makefile (-1 / +8 lines)
1	PORTNAME= root	1	PORTNAME= root
2	DISTVERSION= 6.30.06	2	DISTVERSION= 6.30.06
		3	PORTREVISION= 3
3	CATEGORIES= devel science math parallel python	4	CATEGORIES= devel science math parallel python
4	MASTER_SITES= https://root.cern/download/	5	MASTER_SITES= https://root.cern/download/
5	DISTFILES= ${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX}	6	DISTFILES= ${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX}
Lines 11-16 WWW= https://root.cern/ Link Here
11	LICENSE= LGPL21	12	LICENSE= LGPL21
12	LICENSE_FILE= ${WRKSRC}/LGPL2_1.txt	13	LICENSE_FILE= ${WRKSRC}/LGPL2_1.txt
13		14
		15	# future-proofing w.r.t. next CURRENT release
		16	BROKEN_FreeBSD_16= fails to build: Patch for newest CURRENT release is missing
		17
14	BUILD_AND_RUN_DEPENDS= bash:shells/bash \	18	BUILD_AND_RUN_DEPENDS= bash:shells/bash \
15	nlohmann-json>=3:devel/nlohmann-json	19	nlohmann-json>=3:devel/nlohmann-json
16	BUILD_DEPENDS= ${BUILD_AND_RUN_DEPENDS}	20	BUILD_DEPENDS= ${BUILD_AND_RUN_DEPENDS}
Lines 56-62 python_OLD_CMD+= "/usr/bin/env @python@" Link Here
56	# Flags and environment variables for building	60	# Flags and environment variables for building
57	CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17	61	CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17
58	CMAKE_ON= gnuinstall soversion mathmore	62	CMAKE_ON= gnuinstall soversion mathmore
59	CMAKE_OFF= builtin_gtest clad	63	CMAKE_OFF= builtin_davix builtin_gtest clad davix
60	CONFIGURE_WRKSRC?= ${WRKDIR}/.build	64	CONFIGURE_WRKSRC?= ${WRKDIR}/.build
61	MAKE_ENV+= ROOTSYS=${CONFIGURE_WRKSRC}	65	MAKE_ENV+= ROOTSYS=${CONFIGURE_WRKSRC}
62		66
Lines 117-122 PLIST_SUB+= NOT_INSTALLED_ON_AARCH64="@comment " ONLY_INSTALLED_ON_AARCH64="" AA Link Here
117	PLIST_SUB+= NOT_INSTALLED_ON_AARCH64="" ONLY_INSTALLED_ON_AARCH64="@comment " AARCH64_PCM_PREFIX="" AARCH64_PCM_SUFFIX=""	121	PLIST_SUB+= NOT_INSTALLED_ON_AARCH64="" ONLY_INSTALLED_ON_AARCH64="@comment " AARCH64_PCM_PREFIX="" AARCH64_PCM_SUFFIX=""
118	.endif	122	.endif
119		123
		124	.if ${OPSYS} == FreeBSD && ${ARCH} == "aarch64" && ${OSVERSION} > 1499999
		125	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-interpreter_cling_lib_Interpreter_Interpreter.cpp.15aarch64
		126	.endif
120	# std_config.pcm exclusive to FreeBSD 14	127	# std_config.pcm exclusive to FreeBSD 14
121	.if ${OPSYS} == FreeBSD && (1400000 <= ${OSVERSION} && ${OSVERSION} < 1500000)	128	.if ${OPSYS} == FreeBSD && (1400000 <= ${OSVERSION} && ${OSVERSION} < 1500000)
122	PLIST_SUB+= ONLY_INSTALLED_ON_FBSD14=""	129	PLIST_SUB+= ONLY_INSTALLED_ON_FBSD14=""




--- interpreter/cling/lib/Interpreter/Interpreter.cpp.orig	2024-05-19 10:35:56 UTC
+++ interpreter/cling/lib/Interpreter/Interpreter.cpp
@@ -492,7 +492,7 @@ namespace cling {
       Strm << "#define __dso_handle ((void*)" << ThisP << ")\n";
 
     // C atexit, std::atexit
-    Strm << Linkage << " int atexit(void(*f)()) " << Attr;
+    Strm << Linkage << " int atexit(void(*f)()) throw () " << Attr;
     if (EmitDefinitions)
       Strm << " { return __cxa_atexit((void(*)(void*))f, 0, __dso_handle); }\n";
     else
@@ -501,7 +501,7 @@ namespace cling {
 
     // C++ 11 at_quick_exit, std::at_quick_exit
     if (LangOpts.CPlusPlus && LangOpts.CPlusPlus11) {
-      Strm << LinkageCxx << " int at_quick_exit(void(*f)()) " << Attr;
+      Strm << LinkageCxx << " int at_quick_exit(void(*f)()) throw () " << Attr;
       if (EmitDefinitions)
         Strm
           << " { return __cxa_atexit((void(*)(void*))f, 0, __dso_handle); }\n";

Lines 1-5 Link Here

(-)b/devel/root/files/interpreter-cling-include-cling-std__fbsd14.0.modulemap (-1 / +1 lines)
1	// FreeBSD port maintainer note:	1	// FreeBSD port maintainer note:
2	// Taken from	2	// Taken from
3	// https://github.com/freebsd/freebsd-src/blob/release/14.0.0/lib/libc%2B%2B/module.modulemap	3	// https://github.com/freebsd/freebsd-src/blob/release/14.0.0/lib/libc%2B%2B/module.modulemap
4	// on 2024-05-15.	4	// on 2024-05-15.
5		5

Lines 1-5 Link Here

(-)b/devel/root/files/interpreter-cling-include-cling-std__fbsd15.0.modulemap (-1 / +1 lines)
1	// FreeBSD port maintainer note:	1	// FreeBSD port maintainer note:
2	// Taken from	2	// Taken from
3	// https://github.com/freebsd/freebsd-src/blob/main/lib/libc%2B%2B/module.modulemap	3	// https://github.com/freebsd/freebsd-src/blob/main/lib/libc%2B%2B/module.modulemap
4	// on 2024-05-15.	4	// on 2024-05-15.
5	// Outer "module std [system] { }" block has been added.	5	// Outer "module std [system] { }" block has been added.

Return to bug 278110

Added Link Here

(-)b/devel/root/files/extra-patch-interpreter_cling_lib_Interpreter_Interpreter.cpp.15aarch64 (+20 lines)
1	--- interpreter/cling/lib/Interpreter/Interpreter.cpp.orig 2024-05-19 10:35:56 UTC
2	+++ interpreter/cling/lib/Interpreter/Interpreter.cpp
3	@@ -492,7 +492,7 @@ namespace cling {
4	Strm << "#define __dso_handle ((void*)" << ThisP << ")\n";
5
6	// C atexit, std::atexit
7	- Strm << Linkage << " int atexit(void(*f)()) " << Attr;
8	+ Strm << Linkage << " int atexit(void(*f)()) throw () " << Attr;
9	if (EmitDefinitions)
10	Strm << " { return __cxa_atexit((void()(void))f, 0, __dso_handle); }\n";
11	else
12	@@ -501,7 +501,7 @@ namespace cling {
13
14	// C++ 11 at_quick_exit, std::at_quick_exit
15	if (LangOpts.CPlusPlus && LangOpts.CPlusPlus11) {
16	- Strm << LinkageCxx << " int at_quick_exit(void(*f)()) " << Attr;
17	+ Strm << LinkageCxx << " int at_quick_exit(void(*f)()) throw () " << Attr;
18	if (EmitDefinitions)
19	Strm
20	<< " { return __cxa_atexit((void()(void))f, 0, __dso_handle); }\n";

Lines 3828-3834 lib/root/libMultiProc.so.%%SHLIB_VER%% Link Here

(-)b/devel/root/pkg-plist (-2 / +1 lines)
3828	lib/root/libNet.so	3828	lib/root/libNet.so
3829	lib/root/libNet.so.%%SHLIB_SHVER%%	3829	lib/root/libNet.so.%%SHLIB_SHVER%%
3830	lib/root/libNet.so.%%SHLIB_VER%%	3830	lib/root/libNet.so.%%SHLIB_VER%%
3831	%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetx.rootmap
3832	%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetxNG.rootmap	3831	%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetxNG.rootmap
3833	lib/root/libNetxNG.so	3832	lib/root/libNetxNG.so
3834	lib/root/libNetxNG.so.%%SHLIB_SHVER%%	3833	lib/root/libNetxNG.so.%%SHLIB_SHVER%%
Lines 4210-4216 lib/root/libvectorDict.so.%%SHLIB_SHVER%% Link Here
4210	lib/root/libvectorDict.so.%%SHLIB_VER%%	4209	lib/root/libvectorDict.so.%%SHLIB_VER%%
4211	%%NOT_INSTALLED_ON_AARCH64%%lib/root/modules.idx	4210	%%NOT_INSTALLED_ON_AARCH64%%lib/root/modules.idx
4212	%%NOT_INSTALLED_ON_AARCH64%%lib/root/std.pcm	4211	%%NOT_INSTALLED_ON_AARCH64%%lib/root/std.pcm
4213	%%ONLY_INSTALLED_ON_FBSD14%%lib/root/std_config.pcm	4212	%%ONLY_INSTALLED_ON_FBSD14%%%%NOT_INSTALLED_ON_AARCH64%%lib/root/std_config.pcm
4214	%%PORTDOCS%%%%DOCSDIR%%/CREDITS	4213	%%PORTDOCS%%%%DOCSDIR%%/CREDITS
4215	%%PORTDOCS%%%%DOCSDIR%%/DEVELOPMENT.md	4214	%%PORTDOCS%%%%DOCSDIR%%/DEVELOPMENT.md
4216	%%PORTDOCS%%%%DOCSDIR%%/INSTALL	4215	%%PORTDOCS%%%%DOCSDIR%%/INSTALL