diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /net-wireless/uhd/files | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'net-wireless/uhd/files')
-rw-r--r-- | net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch | 45 | ||||
-rw-r--r-- | net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch | 42 | ||||
-rw-r--r-- | net-wireless/uhd/files/uhd-4.1.0.5-hidden-visibility-tests.patch | 24 |
3 files changed, 24 insertions, 87 deletions
diff --git a/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch b/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch deleted file mode 100644 index de165e9deebf..000000000000 --- a/net-wireless/uhd/files/uhd-3.13.1.0-tinfo.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git host/CMakeLists.txt host/CMakeLists.txt -index 2337396e7..3a77776a0 100644 ---- host/CMakeLists.txt -+++ host/CMakeLists.txt -@@ -531,6 +531,9 @@ endforeach(Boost_Comp) - if(ENABLE_USB) - list(APPEND UHD_LINK_LIST_STATIC "usb-1.0") - endif(ENABLE_USB) -+ -+LIST(APPEND UHD_LINK_LIST_STATIC "tinfo") -+ - # UHDConfig.cmake also needs UHD_RFNOC_FOUND - if(ENABLE_RFNOC) - set(UHD_RFNOC_FOUND "TRUE") -diff --git host/examples/CMakeLists.txt host/examples/CMakeLists.txt -index b384d978c..402aded94 100644 ---- host/examples/CMakeLists.txt -+++ host/examples/CMakeLists.txt -@@ -58,11 +58,11 @@ find_package(Curses) - if(CURSES_FOUND) - include_directories(${CURSES_INCLUDE_DIR}) - add_executable(rx_ascii_art_dft rx_ascii_art_dft.cpp) -- target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) -+ target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES}) - UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) - - add_executable(twinrx_freq_hopping twinrx_freq_hopping.cpp) -- target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) -+ target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES}) - UHD_INSTALL(TARGETS twinrx_freq_hopping RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) - endif(CURSES_FOUND) - -diff --git host/utils/latency/CMakeLists.txt host/utils/latency/CMakeLists.txt -index 05bacd77a..d3b1449a6 100644 ---- host/utils/latency/CMakeLists.txt -+++ host/utils/latency/CMakeLists.txt -@@ -25,7 +25,7 @@ if(CURSES_FOUND) - get_filename_component(name ${source} NAME_WE) - add_executable(${name} ${source} ${latency_lib_path}) - LIBUHD_APPEND_SOURCES(${name}) -- target_link_libraries(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES}) -+ target_link_libraries(${name} uhd ${Boost_LIBRARIES} tinfo ${CURSES_LIBRARIES}) - UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) - endforeach(source) - diff --git a/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch b/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch deleted file mode 100644 index 484aa1f9c2f5..000000000000 --- a/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur host/CMakeLists.txt uhd-4.0.0.0-patched/host/CMakeLists.txt ---- host/CMakeLists.txt 2020-09-13 15:14:04.000000000 -0400 -+++ host/CMakeLists.txt 2020-09-16 10:11:52.266933094 -0400 -@@ -506,6 +506,9 @@ - if(ENABLE_USB) - list(APPEND UHD_LINK_LIST_STATIC "usb-1.0") - endif(ENABLE_USB) -+ -+LIST(APPEND UHD_LINK_LIST_STATIC "tinfo") -+ - set(UHD_RFNOC_FOUND "TRUE") - - configure_file( -diff -Naur host/examples/CMakeLists.txt uhd-4.0.0.0-patched/host/examples/CMakeLists.txt ---- host/examples/CMakeLists.txt 2020-09-13 15:14:04.000000000 -0400 -+++ host/examples/CMakeLists.txt 2020-09-16 10:12:49.082935381 -0400 -@@ -55,11 +55,11 @@ - if(CURSES_FOUND) - include_directories(${CURSES_INCLUDE_DIR}) - add_executable(rx_ascii_art_dft rx_ascii_art_dft.cpp) -- target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) -+ target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES}) - UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) - - add_executable(twinrx_freq_hopping twinrx_freq_hopping.cpp) -- target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES}) -+ target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES}) - UHD_INSTALL(TARGETS twinrx_freq_hopping RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples) - endif(CURSES_FOUND) - -diff -Naur host/utils/latency/CMakeLists.txt uhd-4.0.0.0-patched/host/utils/latency/CMakeLists.txt ---- host/utils/latency/CMakeLists.txt 2020-09-13 15:14:04.000000000 -0400 -+++ host/utils/latency/CMakeLists.txt 2020-09-16 10:13:55.994938074 -0400 -@@ -25,7 +25,7 @@ - get_filename_component(name ${source} NAME_WE) - add_executable(${name} ${source} ${latency_lib_path}) - LIBUHD_APPEND_SOURCES(${name}) -- target_link_libraries(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES}) -+ target_link_libraries(${name} uhd ${Boost_LIBRARIES} tinfo ${CURSES_LIBRARIES}) - UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name}) - endforeach(source) - diff --git a/net-wireless/uhd/files/uhd-4.1.0.5-hidden-visibility-tests.patch b/net-wireless/uhd/files/uhd-4.1.0.5-hidden-visibility-tests.patch new file mode 100644 index 000000000000..7c353ec6d717 --- /dev/null +++ b/net-wireless/uhd/files/uhd-4.1.0.5-hidden-visibility-tests.patch @@ -0,0 +1,24 @@ +From 4ecb79d8980fcf7cd0ff25c8c21bf473156fdb19 Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Tue, 15 Feb 2022 11:24:54 +0100 +Subject: [PATCH] Build uhd_test library as static when + `-DBUILD_SHARED_LIBS=ON` + +* A uhd_test.so lacks the necessary symbols for testing + due to default visibility set to hidden. +--- + tests/common/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/common/CMakeLists.txt b/tests/common/CMakeLists.txt +index ac0e1b4492..36c9f9b076 100644 +--- a/tests/common/CMakeLists.txt ++++ b/tests/common/CMakeLists.txt +@@ -8,6 +8,6 @@ + # Build uhd_test static lib + ######################################################################## + include_directories("${UHD_SOURCE_DIR}/lib/include") +-add_library(uhd_test ++add_library(uhd_test STATIC + ${CMAKE_CURRENT_SOURCE_DIR}/mock_zero_copy.cpp + ) |