From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/, net-wireless/uhd/files/
Date: Tue, 15 Feb 2022 10:45:40 +0000 (UTC) [thread overview]
Message-ID: <1644921932.49c792e6e3a926f807d76c733eb468db6a1f5086.soap@gentoo> (raw)
commit: 49c792e6e3a926f807d76c733eb468db6a1f5086
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 10:45:32 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 10:45:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c792e6
net-wireless/uhd: fix build with `-DBUILD_SHARED_LIBS=ON`
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../uhd-3.15.0.0-hidden-visibility-tests.patch | 26 ++++++++++++++++++++++
.../uhd-4.1.0.4-hidden-visibility-tests.patch | 24 ++++++++++++++++++++
net-wireless/uhd/uhd-3.15.0.0-r100.ebuild | 5 ++++-
net-wireless/uhd/uhd-4.1.0.4.ebuild | 1 +
4 files changed, 55 insertions(+), 1 deletion(-)
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"
next reply other threads:[~2022-02-15 10:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 10:45 David Seifert [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-06 9:23 [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/, net-wireless/uhd/files/ Thomas Beierlein
2025-03-31 8:56 Thomas Beierlein
2025-02-24 12:30 Thomas Beierlein
2024-05-28 1:45 Sam James
2022-02-24 16:04 Rick Farina
2021-06-03 2:12 Rick Farina
2020-09-16 17:01 Rick Farina
2019-01-11 3:34 Rick Farina
2018-06-06 8:13 Andreas Sturmlechner
2017-10-16 1:14 Jason Donenfeld
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1644921932.49c792e6e3a926f807d76c733eb468db6a1f5086.soap@gentoo \
--to=soap@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox