diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-12-01 17:03:56 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-12-01 17:03:56 +0000 |
| commit | b704a12f55494cd0f6fef2a547cab684dcecd4de (patch) | |
| tree | 2d8b91e3179588a8b35b9539533db10690b7fcb6 /dev-lang/souffle | |
| parent | 511da2e8215301136bf13531af2329e9703addaf (diff) | |
gentoo auto-resync : 01:12:2023 - 17:03:56
Diffstat (limited to 'dev-lang/souffle')
| -rw-r--r-- | dev-lang/souffle/Manifest | 3 | ||||
| -rw-r--r-- | dev-lang/souffle/files/souffle-2.4.1-threads.patch | 34 | ||||
| -rw-r--r-- | dev-lang/souffle/souffle-2.4.1.ebuild | 1 |
3 files changed, 37 insertions, 1 deletions
diff --git a/dev-lang/souffle/Manifest b/dev-lang/souffle/Manifest index b5f7884aa189..8bfc1aee96d5 100644 --- a/dev-lang/souffle/Manifest +++ b/dev-lang/souffle/Manifest @@ -1,4 +1,5 @@ AUX souffle-2.4.1-ncurses.patch 513 BLAKE2B 4ca9241abcc17691c12004b3632efcfb0438e6dd66753cbb40e34fa53338aacc3dfe80d3912989fee2a1694b5537627037df6052ea909385c8fa62e4ba122080 SHA512 0cf585e60e040f5b62f1511e55d97ee8831b5496e5ba431301380b454874b9720cb4c96a429122cc527aeb0d4a160f4937e1aeff7a9e57a21c5e6be1a1e27710 +AUX souffle-2.4.1-threads.patch 1352 BLAKE2B 2805c6a6579ee55f57e9335162427fb860a12f9bb0b6418dd3705efbe0ca93c6042aa2e83260e0eb95b7f8df9761db90b8f118ba0c264a5ce0f8ae29b4d28490 SHA512 05f057c54b6b070b1f9e79eeccffa4c38f47af810bd14d5ec16c75f3c331386debfe21cd6d16f2d8675bb1f2c2e1ebd74e956b014d8e6eda9650097e44bc9db9 DIST souffle-2.4.1.tar.gz 9668253 BLAKE2B b101a6f24df7d5bd86854d5d19c166bfe8266a9f6e8c8391fdbb79afddec7bd2297bb7af472ebc01ff2d6b0c1516820d96ec47dbf1042167b1435c22f9671ea3 SHA512 5dd321a2b025f2120d7867fa7317b4784a0f0fcc109250721cdb0918009ca218c63cdad004282046885f7096b287bc111e09057311603828ecce53f9cc532319 -EBUILD souffle-2.4.1.ebuild 2570 BLAKE2B d56517c3e754f68b4b1d6ec347107c5d1cf7386b07ab75696190b6ff9ced99d755fb7167fdc37dcf46730aecb5976da251e33f72423851b3a58b80688725c0f5 SHA512 45effdc17500672bede3ba8f517401fc05ab2b01f2e95df11dd69029d4f94a6165964e4e4e10c09f00b0678787d8d462527a2dee5ce8315f6433f5252cc2ea30 +EBUILD souffle-2.4.1.ebuild 2611 BLAKE2B 4780986b97265ef8a965a4770836ff6520cbfe5db4a3466f6c74a523afb715bf587944f0d7035cf36e5996d26bc825e9cec769063163e65ee905f81ec74caf2c SHA512 c7cb712fe7e76c0950307ccd4ecc8a017fd145c3e14ee2dd82233aceba5b743494755303e987743eaeac8d7881604fe76ec6f9064660af7203738c6d9b614bdf MISC metadata.xml 815 BLAKE2B 6685650f4fe61a45d10eafe2ed7d328638b0fb3d2dd23811e77c481d0b9f1d68074d3d29cb386b0060de5e193deb2abf9f8a33634f122cec54fb1c77966bfff3 SHA512 f42d5bbf5e9e8ffb311cb304e99a6b8e6b580e78312b18cdf450998ddda6da56c035a8fea41c5e9df5eb6e7c0b5b2187097eb13a6f54bf3604d9736ee6ea98d7 diff --git a/dev-lang/souffle/files/souffle-2.4.1-threads.patch b/dev-lang/souffle/files/souffle-2.4.1-threads.patch new file mode 100644 index 000000000000..92e2ce79b409 --- /dev/null +++ b/dev-lang/souffle/files/souffle-2.4.1-threads.patch @@ -0,0 +1,34 @@ +Stolen from NixOS packages... later they removed the patch but looks +like this is what should fix bug https://bugs.gentoo.org/918956 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73d5c3c84..e4b0dbfd1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -104,13 +104,6 @@ option(SOUFFLE_CUSTOM_GETOPTLONG "Enable/Disable custom getopt_long implementati + cmake_dependent_option(SOUFFLE_USE_LIBCPP "Link to libc++ instead of libstdc++" ON + "CMAKE_CXX_COMPILER_ID STREQUAL Clang" OFF) + +-# Using Clang? Likely want to use `lld` too. +-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld") +- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld") +- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld") +-endif() +- + # Add aditional modules to CMake + set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) + +@@ -247,7 +240,11 @@ endif() + # pthreads + # -------------------------------------------------- + set(THREADS_PREFER_PTHREAD_FLAG ON) +-find_package(Threads REQUIRED) ++set(CMAKE_THREAD_LIBS_INIT "-lpthread") ++set(CMAKE_HAVE_THREADS_LIBRARY 1) ++set(CMAKE_USE_WIN32_THREADS_INIT 0) ++set(CMAKE_USE_PTHREADS_INIT 1) ++set(THREADS_PREFER_PTHREAD_FLAG ON) + + # -------------------------------------------------- + # OpenMP diff --git a/dev-lang/souffle/souffle-2.4.1.ebuild b/dev-lang/souffle/souffle-2.4.1.ebuild index 5bf3f618cb58..9e2e1af841fc 100644 --- a/dev-lang/souffle/souffle-2.4.1.ebuild +++ b/dev-lang/souffle/souffle-2.4.1.ebuild @@ -52,6 +52,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-2.4.1-ncurses.patch" + "${FILESDIR}/${PN}-2.4.1-threads.patch" ) pkg_pretend() { |