diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-12-20 21:05:35 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-12-20 23:31:02 +0100 |
| commit | 572dcd65b441136ad462d2d8b9651aa791ba6dac (patch) | |
| tree | d2be91af05ab21b9fcd4ead0a793284a93b2358b /net-libs/cppzmq/files | |
| parent | media-libs/libmatroska: drop 1.6.3 (diff) | |
| download | gentoo-572dcd65b441136ad462d2d8b9651aa791ba6dac.tar.gz gentoo-572dcd65b441136ad462d2d8b9651aa791ba6dac.tar.bz2 gentoo-572dcd65b441136ad462d2d8b9651aa791ba6dac.zip | |
net-libs/cppzmq: drop 4.6.0
Closes: https://bugs.gentoo.org/887527
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'net-libs/cppzmq/files')
| -rw-r--r-- | net-libs/cppzmq/files/cppzmq-disable-static.patch | 35 | ||||
| -rw-r--r-- | net-libs/cppzmq/files/cppzmq-use-system-catch2.patch | 27 |
2 files changed, 0 insertions, 62 deletions
diff --git a/net-libs/cppzmq/files/cppzmq-disable-static.patch b/net-libs/cppzmq/files/cppzmq-disable-static.patch deleted file mode 100644 index 12b1c2231205..000000000000 --- a/net-libs/cppzmq/files/cppzmq-disable-static.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,7 +20,7 @@ - message(FATAL_ERROR "ZeroMQ was not found, neither as a CMake package nor via pkg-config") - endif() - --if (ZeroMQ_FOUND AND (NOT TARGET libzmq OR NOT TARGET libzmq-static)) -+if (ZeroMQ_FOUND AND NOT TARGET libzmq) - message(FATAL_ERROR "ZeroMQ version not supported!") - endif() - -@@ -43,19 +43,20 @@ - zmq_addon.hpp - ) - --foreach (target cppzmq cppzmq-static) -+set (cppzmq_targets cppzmq cppzmq-static) -+ -+foreach (target ${cppzmq_targets}) - add_library(${target} INTERFACE) - target_include_directories(${target} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> - $<INSTALL_INTERFACE:include>) - endforeach() - - target_link_libraries(cppzmq INTERFACE libzmq) --target_link_libraries(cppzmq-static INTERFACE libzmq-static) - - include(GNUInstallDirs) - include(CMakePackageConfigHelpers) - --install(TARGETS cppzmq cppzmq-static -+install(TARGETS ${cppzmq_targets} - EXPORT ${PROJECT_NAME}-targets) - - install(FILES ${CPPZMQ_HEADERS} diff --git a/net-libs/cppzmq/files/cppzmq-use-system-catch2.patch b/net-libs/cppzmq/files/cppzmq-use-system-catch2.patch deleted file mode 100644 index b15b9172ad43..000000000000 --- a/net-libs/cppzmq/files/cppzmq-use-system-catch2.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -9,9 +9,10 @@ - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}) - -+find_package(Catch2 REQUIRED) - include(CTest) --include(cmake/catch.cmake) --include(${CATCH_MODULE_PATH}/Catch.cmake) -+include(Catch) -+find_path(CATCH_INCLUDE_DIR "catch.hpp" HINT /usr/include/catch/) - - find_package(Threads) - -@@ -31,9 +32,9 @@ - utilities.cpp - ) - --add_dependencies(unit_tests catch) -+add_dependencies(unit_tests Catch2::Catch2) - --target_include_directories(unit_tests PUBLIC ${CATCH_MODULE_PATH}) -+target_include_directories(unit_tests PUBLIC ${CATCH_INCLUDE_DIR}) - target_link_libraries( - unit_tests - PRIVATE cppzmq |