From 90a3be9d71a22834f9bc82c072f1b993f9a10e31 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Aug 2023 21:42:17 +0100 Subject: gentoo auto-resync : 20:08:2023 - 21:42:17 --- .../uhd-4.1.0.5-hidden-visibility-tests.patch | 24 ------ net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch | 95 ---------------------- 2 files changed, 119 deletions(-) delete mode 100644 net-wireless/uhd/files/uhd-4.1.0.5-hidden-visibility-tests.patch delete mode 100644 net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch (limited to 'net-wireless/uhd/files') 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 deleted file mode 100644 index 7c353ec6d717..000000000000 --- a/net-wireless/uhd/files/uhd-4.1.0.5-hidden-visibility-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4ecb79d8980fcf7cd0ff25c8c21bf473156fdb19 Mon Sep 17 00:00:00 2001 -From: David Seifert -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 - ) diff --git a/net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch b/net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch deleted file mode 100644 index 8559ecb8331f..000000000000 --- a/net-wireless/uhd/files/uhd-4.3.0.0-gcc-13.patch +++ /dev/null @@ -1,95 +0,0 @@ -https://github.com/EttusResearch/uhd/pull/652 - -From 48a05bf621a056af7764437760ad5d64684ce7d2 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Tue, 3 Jan 2023 23:04:52 +0000 -Subject: [PATCH] Fix build with GCC 13 (add missing include) - -GCC 13 (as usual for new compiler releases) shuffles around some -internal includes and so is no longer transitively included. - -Explicitly include for uint8_t. - -``` -/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/include/uhd/rfnoc/defaults.hpp:43:14: error: 'uint32_t' does not name a type - 43 | static const uint32_t DEFAULT_NOC_ID = 0xFFFFFFFF; - | ^~~~~~~~ -/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/include/uhd/rfnoc/defaults.hpp:1:1: note: 'uint32_t' is defined in header ''; did you forget to '#include '? - +++ |+#include - 1 | // -``` - -Signed-off-by: Sam James ---- a/include/uhd/cal/database.hpp -+++ b/include/uhd/cal/database.hpp -@@ -8,6 +8,7 @@ - - #include - #include -+#include - #include - #include - #include ---- a/include/uhd/rfnoc/defaults.hpp -+++ b/include/uhd/rfnoc/defaults.hpp -@@ -8,6 +8,7 @@ - - #pragma once - -+#include - #include - - namespace uhd { namespace rfnoc { ---- a/include/uhd/types/eeprom.hpp -+++ b/include/uhd/types/eeprom.hpp -@@ -6,6 +6,7 @@ - - #pragma once - -+#include - #include - #include - #include ---- a/include/uhd/usrp/zbx_tune_map_item.hpp -+++ b/include/uhd/usrp/zbx_tune_map_item.hpp -@@ -6,6 +6,7 @@ - - #pragma once - #include -+#include - #include - #include - #include ---- a/lib/usrp/dboard/magnesium/magnesium_constants.hpp -+++ b/lib/usrp/dboard/magnesium/magnesium_constants.hpp -@@ -9,6 +9,7 @@ - - #include - #include -+#include - #include - #include - ---- a/lib/usrp/dboard/rhodium/rhodium_constants.hpp -+++ b/lib/usrp/dboard/rhodium/rhodium_constants.hpp -@@ -9,6 +9,7 @@ - - #include - #include -+#include - #include - #include - ---- a/lib/utils/serial_number.cpp -+++ b/lib/utils/serial_number.cpp -@@ -5,6 +5,7 @@ - // - - #include -+#include - #include - #include - --- -2.39.0 - -- cgit v1.2.3