diff options
Diffstat (limited to 'devel/root/files')
-rw-r--r-- | devel/root/files/patch-cmake_modules_SearchInstalledSoftware.cmake | 22 | ||||
-rw-r--r-- | devel/root/files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp | 20 |
2 files changed, 0 insertions, 42 deletions
diff --git a/devel/root/files/patch-cmake_modules_SearchInstalledSoftware.cmake b/devel/root/files/patch-cmake_modules_SearchInstalledSoftware.cmake deleted file mode 100644 index 0ea6f4daf246..000000000000 --- a/devel/root/files/patch-cmake_modules_SearchInstalledSoftware.cmake +++ /dev/null @@ -1,22 +0,0 @@ ---- cmake/modules/SearchInstalledSoftware.cmake.orig 2024-11-30 13:10:36 UTC -+++ cmake/modules/SearchInstalledSoftware.cmake -@@ -525,6 +525,9 @@ if(asimage) - if(builtin_zlib) - set(_after_cflags "${_after_cflags} -I${ZLIB_INCLUDE_DIR}") - endif() -+ if(CMAKE_SYSTEM_NAME MATCHES FreeBSD) -+ set(AFTERIMAGE_LIBRARIES ${CMAKE_BINARY_DIR}/AFTERIMAGE-prefix/src/AFTERIMAGE/libAfterImage${CMAKE_STATIC_LIBRARY_SUFFIX}) -+ endif() - ExternalProject_Add( - AFTERIMAGE - DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/graf2d/asimage/src/libAfterImage AFTERIMAGE -@@ -541,6 +544,9 @@ if(asimage) - TIMEOUT 600 - ) - set(AFTERIMAGE_INCLUDE_DIR ${CMAKE_BINARY_DIR}/include/libAfterImage) -+ if(CMAKE_SYSTEM_NAME MATCHES FreeBSD) -+ set(AFTERIMAGE_INCLUDE_DIR ${CMAKE_BINARY_DIR}/AFTERIMAGE-prefix/src/AFTERIMAGE) -+ endif() - endif() - if(builtin_freetype) - add_dependencies(AFTERIMAGE FREETYPE) diff --git a/devel/root/files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp b/devel/root/files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp deleted file mode 100644 index 0b87e252002c..000000000000 --- a/devel/root/files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- interpreter/cling/lib/Interpreter/Interpreter.cpp.orig 2024-11-30 13:04:19 UTC -+++ interpreter/cling/lib/Interpreter/Interpreter.cpp -@@ -458,8 +458,17 @@ namespace cling { - const char* Attr = LangOpts.CPlusPlus ? " throw () " : ""; - #else - const char* LinkageCxx = Linkage; -+#ifdef __FreeBSD__ -+// atexit-like commands need 'throw()' specifier on FreeBSD 15 -+#if __FreeBSD_cc_version >= 1500000 -+ const char* Attr = " throw () "; -+#else - const char* Attr = ""; - #endif -+#else -+ const char* Attr = ""; -+#endif // __FreeBSD__ -+#endif // __GLIBC__ - - #if defined(__GLIBCXX__) - const char* cxa_atexit_is_noexcept = LangOpts.CPlusPlus ? " noexcept" : ""; |