mirror of
https://github.com/pentoo/pentoo-overlay
synced 2025-12-06 08:25:01 +01:00
srsran: and it works
This commit is contained in:
Rick Farina (Zero_Chaos)
parent
0da6a26235
commit
9dd63c7290
4 changed files with 68 additions and 8 deletions
63
net-wireless/srsran/files/srsran-22.04-fix-shared.patch
Normal file
63
net-wireless/srsran/files/srsran-22.04-fix-shared.patch
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
From 2e1a7abfb313f874add9efa2cdd716dffd842782 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Falkenberg <robert.falkenberg@srs.io>
|
||||
Date: Tue, 10 May 2022 09:14:25 +0200
|
||||
Subject: [PATCH] cmake: fix build for cmake option BUILD_SHARED_LIBS=ON
|
||||
|
||||
The cmake option BUILD_SHARED_LIBS (off by default) causes all
|
||||
libraries to be built as shared libraries if not unless explicitly
|
||||
stated otherwise.
|
||||
Since test-helper libraries do not export their symbols, linking
|
||||
fails if built as shared library.
|
||||
Therefore, this change explicitly configures these helpers as STATIC.
|
||||
---
|
||||
srsenb/test/rrc/CMakeLists.txt | 2 +-
|
||||
srsgnb/src/stack/mac/test/CMakeLists.txt | 4 ++--
|
||||
srsgnb/src/stack/rrc/test/CMakeLists.txt | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/srsenb/test/rrc/CMakeLists.txt b/srsenb/test/rrc/CMakeLists.txt
|
||||
index ccfd7bd15f..d931a4fedb 100644
|
||||
--- a/srsenb/test/rrc/CMakeLists.txt
|
||||
+++ b/srsenb/test/rrc/CMakeLists.txt
|
||||
@@ -18,7 +18,7 @@
|
||||
# and at http://www.gnu.org/licenses/.
|
||||
#
|
||||
|
||||
-add_library(test_helpers test_helpers.cc)
|
||||
+add_library(test_helpers STATIC test_helpers.cc)
|
||||
target_link_libraries(test_helpers srsenb_rrc srsenb_common rrc_asn1 rrc_nr_asn1 s1ap_asn1 srsran_common enb_cfg_parser ${LIBCONFIGPP_LIBRARIES})
|
||||
|
||||
add_executable(rrc_meascfg_test rrc_meascfg_test.cc)
|
||||
diff --git a/srsgnb/src/stack/mac/test/CMakeLists.txt b/srsgnb/src/stack/mac/test/CMakeLists.txt
|
||||
index f37165e8f5..4f38b08f09 100644
|
||||
--- a/srsgnb/src/stack/mac/test/CMakeLists.txt
|
||||
+++ b/srsgnb/src/stack/mac/test/CMakeLists.txt
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
set_directory_properties(PROPERTIES LABELS "sched;nr")
|
||||
|
||||
-add_library(sched_nr_test_suite sched_nr_common_test.cc sched_nr_ue_ded_test_suite.cc sched_nr_sim_ue.cc)
|
||||
+add_library(sched_nr_test_suite STATIC sched_nr_common_test.cc sched_nr_ue_ded_test_suite.cc sched_nr_sim_ue.cc)
|
||||
target_link_libraries(sched_nr_test_suite srsgnb_mac srsran_common rrc_nr_asn1)
|
||||
|
||||
add_executable(sched_nr_parallel_test sched_nr_parallel_test.cc)
|
||||
@@ -65,4 +65,4 @@ target_link_libraries(sched_nr_test
|
||||
rrc_nr_asn1
|
||||
srsran_common ${CMAKE_THREAD_LIBS_INIT}
|
||||
${Boost_LIBRARIES})
|
||||
-add_nr_test(sched_nr_test sched_nr_test)
|
||||
\ No newline at end of file
|
||||
+add_nr_test(sched_nr_test sched_nr_test)
|
||||
diff --git a/srsgnb/src/stack/rrc/test/CMakeLists.txt b/srsgnb/src/stack/rrc/test/CMakeLists.txt
|
||||
index 640e26ce47..072d1b31c7 100644
|
||||
--- a/srsgnb/src/stack/rrc/test/CMakeLists.txt
|
||||
+++ b/srsgnb/src/stack/rrc/test/CMakeLists.txt
|
||||
@@ -18,7 +18,7 @@
|
||||
# and at http://www.gnu.org/licenses/.
|
||||
#
|
||||
|
||||
-add_library(rrc_nr_test_helpers rrc_nr_test_helpers.cc)
|
||||
+add_library(rrc_nr_test_helpers STATIC rrc_nr_test_helpers.cc)
|
||||
|
||||
add_executable(rrc_nr_test rrc_nr_test.cc)
|
||||
target_link_libraries(rrc_nr_test srsgnb_rrc srsgnb_rrc_config_utils srsran_common rrc_nr_asn1 rrc_nr_test_helpers srsgnb_mac ${ATOMIC_LIBS})
|
||||
|
|
@ -24,7 +24,6 @@ else
|
|||
SRC_URI="https://github.com/srsran/srsRAN/archive/refs/tags/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
#https://github.com/srsran/srsRAN/issues/834
|
||||
#https://github.com/srsran/srsRAN/issues/835
|
||||
RESTRICT="test"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
|
|
@ -48,10 +47,10 @@ RDEPEND="${DEPEND}
|
|||
!net-wireless/srslte"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=( "${FILESDIR}/srsran-22.04-fix-shared.patch" )
|
||||
|
||||
src_prepare() {
|
||||
sed -i '/ -Werror"/d' CMakeLists.txt || die
|
||||
unset CFLAGS
|
||||
unset CXXFLAGS
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
|
|
@ -71,8 +70,5 @@ src_configure() {
|
|||
-DENABLE_ZEROMQ="$(usex zeromq)"
|
||||
-DENABLE_HARDSIM="$(usex simcard)"
|
||||
)
|
||||
unset CFLAGS
|
||||
unset CXXFLAGS
|
||||
cmake_src_configure
|
||||
sed -i 's/-Os -march=native -mtune=native -pipe -frecord-gcc-switches//g' "${BUILD_DIR}/gentoo_rules.cmake" || die
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ else
|
|||
SRC_URI="https://github.com/srsran/srsRAN/archive/refs/tags/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||
fi
|
||||
#https://github.com/srsran/srsRAN/issues/834
|
||||
#https://github.com/srsran/srsRAN/issues/835
|
||||
RESTRICT="test"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
|
|
@ -48,6 +47,8 @@ RDEPEND="${DEPEND}
|
|||
!net-wireless/srslte"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=( "${FILESDIR}/srsran-22.04-fix-shared.patch" )
|
||||
|
||||
src_prepare() {
|
||||
sed -i '/ -Werror"/d' CMakeLists.txt || die
|
||||
cmake_src_prepare
|
||||
|
|
|
|||
|
|
@ -75,4 +75,4 @@ dev-libs/pocl accel
|
|||
#https://github.com/srsran/srsRAN/issues/852
|
||||
#https://github.com/srsran/srsRAN/issues/854
|
||||
#https://github.com/srsran/srsRAN/issues/855
|
||||
net-wireless/srsran bladerf soapysdr uhd zeromq
|
||||
#net-wireless/srsran bladerf soapysdr uhd zeromq
|
||||
|
|
|
|||
Loading…
Reference in a new issue