summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2022-02-15 11:45:32 +0100
committerDavid Seifert <soap@gentoo.org>2022-02-15 11:45:32 +0100
commit49c792e6e3a926f807d76c733eb468db6a1f5086 (patch)
tree0269b375a7ba641ff03fe526cab4ced6549fe2bd /net-wireless/uhd
parentdev-perl/XML-Parser: drop 2.440.0 (EAPI 5--) (diff)
downloadgentoo-49c792e6e3a926f807d76c733eb468db6a1f5086.tar.gz
gentoo-49c792e6e3a926f807d76c733eb468db6a1f5086.tar.bz2
gentoo-49c792e6e3a926f807d76c733eb468db6a1f5086.zip
net-wireless/uhd: fix build with `-DBUILD_SHARED_LIBS=ON`
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'net-wireless/uhd')
-rw-r--r--net-wireless/uhd/files/uhd-3.15.0.0-hidden-visibility-tests.patch26
-rw-r--r--net-wireless/uhd/files/uhd-4.1.0.4-hidden-visibility-tests.patch24
-rw-r--r--net-wireless/uhd/uhd-3.15.0.0-r100.ebuild5
-rw-r--r--net-wireless/uhd/uhd-4.1.0.4.ebuild1
4 files changed, 55 insertions, 1 deletions
diff --git a/net-wireless/uhd/files/uhd-3.15.0.0-hidden-visibility-tests.patch b/net-wireless/uhd/files/uhd-3.15.0.0-hidden-visibility-tests.patch
new file mode 100644
index 000000000000..749313267439
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-3.15.0.0-hidden-visibility-tests.patch
@@ -0,0 +1,26 @@
+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 | 3 +-
+ 1 file changed, 1 insertion(+), 2 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,7 +8,8 @@
+ # Build uhd_test static lib
+ ########################################################################
+ include_directories("${CMAKE_SOURCE_DIR}/lib/include")
+-add_library(uhd_test ${CMAKE_CURRENT_SOURCE_DIR}/mock_ctrl_iface_impl.cpp
++add_library(uhd_test STATIC
++ ${CMAKE_CURRENT_SOURCE_DIR}/mock_ctrl_iface_impl.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/mock_zero_copy.cpp
+ ${CMAKE_SOURCE_DIR}/lib/rfnoc/graph_impl.cpp
+ ${CMAKE_SOURCE_DIR}/lib/rfnoc/async_msg_handler.cpp
diff --git a/net-wireless/uhd/files/uhd-4.1.0.4-hidden-visibility-tests.patch b/net-wireless/uhd/files/uhd-4.1.0.4-hidden-visibility-tests.patch
new file mode 100644
index 000000000000..ca6704c5dff6
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-4.1.0.4-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("${CMAKE_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/uhd-3.15.0.0-r100.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
index 94f22c4bddc2..439b2f78fc50 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -48,7 +48,10 @@ DEPEND="${RDEPEND}
app-arch/gzip
"
-PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch"
+ "${FILESDIR}/${PN}-3.15.0.0-hidden-visibility-tests.patch"
+)
S="${WORKDIR}/${P}/host"
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index 654ad81cca82..3b262ab66ff5 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -50,6 +50,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-4.0.0.0-tinfo.patch"
+ "${FILESDIR}/${PN}-4.1.0.4-hidden-visibility-tests.patch"
)
S="${WORKDIR}/${P}/host"