Attachment 250896 Details for Bug 278110 – Patch of ROOT v. 6.30/06, port revision 1

[patch] Patch of ROOT v. 6.30/06, port revision 1

devel_root04.diff (text/plain), 5.33 KB, created by Erik Jensen on 2024-05-23 12:23:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Erik Jensen

Created: 2024-05-23 12:23:49 UTC

Size: 5.33 KB

patch

obsolete

>diff --git a/devel/root/Makefile b/devel/root/Makefile
>index e1782e634e92..6abf0068fb5d 100644
>--- a/devel/root/Makefile
>+++ b/devel/root/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	root
> DISTVERSION=	6.30.06
>+PORTREVISION=	1
> CATEGORIES=	devel science math parallel python
> MASTER_SITES=	https://root.cern/download/
> DISTFILES=	${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX}
>@@ -11,6 +12,9 @@ WWW=		https://root.cern/
> LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/LGPL2_1.txt
> 
>+# future-proofing w.r.t. next CURRENT release
>+BROKEN_FreeBSD_16=	fails to build: Patch for newest CURRENT release is missing
>+
> BUILD_AND_RUN_DEPENDS=	bash:shells/bash \
> 			nlohmann-json>=3:devel/nlohmann-json
> BUILD_DEPENDS=	${BUILD_AND_RUN_DEPENDS}
>@@ -56,7 +60,7 @@ python_OLD_CMD+=	"/usr/bin/env @python@"
> # Flags and environment variables for building
> CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
> CMAKE_ON=	gnuinstall soversion mathmore
>-CMAKE_OFF=	builtin_gtest clad
>+CMAKE_OFF=	builtin_davix builtin_gtest clad davix
> CONFIGURE_WRKSRC?=	${WRKDIR}/.build
> MAKE_ENV+=		ROOTSYS=${CONFIGURE_WRKSRC}
> 
>diff --git a/devel/root/files/interpreter-cling-include-cling-std__fbsd14.0.modulemap b/devel/root/files/interpreter-cling-include-cling-std__fbsd14.0.modulemap
>index bfe10929e70f..c8510f954f0e 100644
>--- a/devel/root/files/interpreter-cling-include-cling-std__fbsd14.0.modulemap
>+++ b/devel/root/files/interpreter-cling-include-cling-std__fbsd14.0.modulemap
>@@ -1,5 +1,5 @@
> // FreeBSD port maintainer note:
>-// Taken from 
>+// Taken from
> // https://github.com/freebsd/freebsd-src/blob/release/14.0.0/lib/libc%2B%2B/module.modulemap
> // on 2024-05-15.
> 
>diff --git a/devel/root/files/interpreter-cling-include-cling-std__fbsd15.0.modulemap b/devel/root/files/interpreter-cling-include-cling-std__fbsd15.0.modulemap
>index a92ccd7a589a..813b04a5b7c2 100644
>--- a/devel/root/files/interpreter-cling-include-cling-std__fbsd15.0.modulemap
>+++ b/devel/root/files/interpreter-cling-include-cling-std__fbsd15.0.modulemap
>@@ -1,5 +1,5 @@
> // FreeBSD port maintainer note:
>-// Taken from 
>+// Taken from
> // https://github.com/freebsd/freebsd-src/blob/main/lib/libc%2B%2B/module.modulemap
> // on 2024-05-15.
> // Outer "module std [system] { }" block has been added.
>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 be1b9596b173..bc83d7ff1dd7 100644
>--- a/devel/root/files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp
>+++ b/devel/root/files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp
>@@ -1,6 +1,41 @@
>---- interpreter/cling/lib/Interpreter/Interpreter.cpp.orig	2024-04-01 14:37:20 UTC
>+--- interpreter/cling/lib/Interpreter/Interpreter.cpp.orig	2024-05-19 10:35:56 UTC
> +++ interpreter/cling/lib/Interpreter/Interpreter.cpp
>-@@ -876,8 +876,10 @@ namespace cling {
>+@@ -321,7 +321,7 @@ namespace cling {
>+     if (!isInSyntaxOnlyMode() && !m_Opts.CompilerOpts.CUDADevice) {
>+       for (const llvm::StringRef& Sym : Syms) {
>+         void* Addr = m_Executor->getPointerToGlobalFromJIT(Sym);
>+-#if defined(__linux__)
>++#if defined(__linux__) || defined(__FreeBSD__)
>+         // We need to look for the mangled name of at_quick_exit on linux.
>+         if (!Addr && Sym.equals("at_quick_exit"))
>+           Addr = m_Executor->getPointerToGlobalFromJIT("_Z13at_quick_exitPFvvE");
>+@@ -492,7 +492,11 @@ 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)()) "
>++#if defined(__FreeBSD__) && __FreeBSD_version > 1499999
>++         << "throw() "
>++#endif
>++         << Attr;
>+     if (EmitDefinitions)
>+       Strm << " { return __cxa_atexit((void(*)(void*))f, 0, __dso_handle); }\n";
>+     else
>+@@ -501,7 +505,11 @@ 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)()) "
>++#if defined(__FreeBSD__) && __FreeBSD_version > 1499999
>++           << "throw() "
>++#endif
>++           << Attr;
>+       if (EmitDefinitions)
>+         Strm
>+           << " { return __cxa_atexit((void(*)(void*))f, 0, __dso_handle); }\n";
>+@@ -876,8 +884,10 @@ namespace cling {
>                                      /*AllowExtraSearch*/ true))
>        return loadModule(M, complain);
>  
>diff --git a/devel/root/pkg-plist b/devel/root/pkg-plist
>index 69c367b8bb56..788f4eb033dc 100644
>--- a/devel/root/pkg-plist
>+++ b/devel/root/pkg-plist
>@@ -3828,7 +3828,6 @@ lib/root/libMultiProc.so.%%SHLIB_VER%%
> lib/root/libNet.so
> lib/root/libNet.so.%%SHLIB_SHVER%%
> lib/root/libNet.so.%%SHLIB_VER%%
>-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetx.rootmap
> %%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetxNG.rootmap
> lib/root/libNetxNG.so
> lib/root/libNetxNG.so.%%SHLIB_SHVER%%
>@@ -4210,7 +4209,7 @@ lib/root/libvectorDict.so.%%SHLIB_SHVER%%
> lib/root/libvectorDict.so.%%SHLIB_VER%%
> %%NOT_INSTALLED_ON_AARCH64%%lib/root/modules.idx
> %%NOT_INSTALLED_ON_AARCH64%%lib/root/std.pcm
>-%%ONLY_INSTALLED_ON_FBSD14%%lib/root/std_config.pcm
>+%%ONLY_INSTALLED_ON_FBSD14%%%%NOT_INSTALLED_ON_AARCH64%%lib/root/std_config.pcm
> %%PORTDOCS%%%%DOCSDIR%%/CREDITS
> %%PORTDOCS%%%%DOCSDIR%%/DEVELOPMENT.md
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL

Flags:

erik: maintainer-approval+

Actions: View | Diff

Attachments on bug 278110: 249644 | 249667 | 250724 | 250832 | 250896 | 250934 | 251095