Merge pull request #2751 from blshkv/master

srsran
This commit is contained in:
Zero_Chaos 2026-05-04 10:33:01 -04:00 committed by GitHub
commit 79581b8ba0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 20 additions and 125 deletions

View file

@ -19,7 +19,8 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://github.com/srsran/srsRAN_4G.git"
else
inherit vcs-snapshot
KEYWORDS="~amd64 ~x86"
#FIXME: remove temporary, so it could merge
#KEYWORDS="~amd64 ~x86"
MY_PV=${PV//./_}
SRC_URI="https://github.com/srsran/srsRAN_4G/archive/refs/tags/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
fi
@ -75,11 +76,12 @@ src_configure() {
-DENABLE_SOAPYSDR="$(usex soapysdr)"
-DENABLE_ZEROMQ="$(usex zeromq)"
-DENABLE_HARDSIM="$(usex simcard)"
-DCMAKE_C_FLAGS_RELWITHDEBINFO="${CFLAGS}"
-DCMAKE_C_STANDARD=99
-DCMAKE_CXX_STANDARD=14
)
# readd nerfed cflags that are required
append-cflags "-std=c99 -fno-strict-aliasing -D_GNU_SOURCE"
append-cxxflags "-std=c++14 -fno-strict-aliasing -D_GNU_SOURCE"
append-cflags "-fno-strict-aliasing -D_GNU_SOURCE"
append-cxxflags "-fno-strict-aliasing -D_GNU_SOURCE"
# "fix" "auto-detection" from use flags, this is probably horrible
if use cpu_flags_x86_sse; then
append-cflags "-DLV_HAVE_SSE -mfpmath=sse -msse4.1"

View file

@ -75,11 +75,12 @@ src_configure() {
-DENABLE_SOAPYSDR="$(usex soapysdr)"
-DENABLE_ZEROMQ="$(usex zeromq)"
-DENABLE_HARDSIM="$(usex simcard)"
-DCMAKE_C_FLAGS_RELWITHDEBINFO="${CFLAGS}"
-DCMAKE_C_STANDARD=99
-DCMAKE_CXX_STANDARD=14
)
# readd nerfed cflags that are required
append-cflags "-std=c99 -fno-strict-aliasing -D_GNU_SOURCE"
append-cxxflags "-std=c++14 -fno-strict-aliasing -D_GNU_SOURCE"
append-cflags "-fno-strict-aliasing -D_GNU_SOURCE"
append-cxxflags "-fno-strict-aliasing -D_GNU_SOURCE"
# "fix" "auto-detection" from use flags, this is probably horrible
if use cpu_flags_x86_sse; then
append-cflags "-DLV_HAVE_SSE -mfpmath=sse -msse4.1"

View file

@ -1,2 +1 @@
DIST srsran2-20231020.gh.tar.gz 14603567 BLAKE2B 6bd42dcf2dc1db6de60f9e0ae17fc6109a93c91acfea734aa8e697f167d47ac2a7845b58a694a92fe49c65c67710b0716317711b6c69842e6f1a69f9ffbc4600 SHA512 ecbdc0bf34a5406a52f1d1cd10a965f6f6a0470d19e1b86a62958802e1efeea38b36f00e732062a6e1aae993c81f60795784012dfd28222e6d385bb28cbc4f48
DIST srsran2-20240929.gh.tar.gz 14603601 BLAKE2B 8329f586534ae079fc2151764d47d32b09ca4ba150db8cfc74815df9ecbc4f2ad5c4285266182a954542f6d24e90b42a6c4f91887d0c1b3541132a328916b72a SHA512 19fc1650e56ab5d49984c45b8acc74d44673cfd58712f43b27d605db97cfc0b9ece7fa61fee79ffb9504f51ac041eeec78b31dc03e4c0d14bb47222efb5ad392
DIST srsran2-20251015.gh.tar.gz 14604668 BLAKE2B be7473db07f1b7904d2a5ac8df316d9f11bf34776d5f714c8f1e8a054ef5f00e6683cff2e35e4f5df74f9a43a4056aba27a67b442e43301e3b232f3ff6de690f SHA512 3ddafe9b92286c74aaa915e7f547458f6052c58b5d0b1cf4e5907f17b1f2083558f46f25a09b4a110aac0e1d9a6b03f642a619444922831d7fd3041c8e80b5be

View file

@ -1,109 +0,0 @@
# Copyright 2019-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake flag-o-matic
DESCRIPTION="Open source SDR 4G software suite from Software Radio Systems"
HOMEPAGE="https://github.com/hdtuanss/srsRAN2"
# Possible issues to look into
#https://bugs.gentoo.org/713684
#https://bugs.gentoo.org/731720
#https://bugs.gentoo.org/733662
#https://bugs.gentoo.org/832618
HASH_COMMIT="4809688a2d645d5b506343c424d8ae39a01d3e3a"
SRC_URI="https://github.com/hdtuanss/srsRAN2/archive/${HASH_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}/srsRAN2-${HASH_COMMIT}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="bladerf cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_fma3 cpu_flags_x86_sse simcard soapysdr test uhd zeromq"
RESTRICT="!test? ( test )"
#Add cpu_flags_x86_avx2= after fixing whatever build failure
DEPEND="
dev-libs/boost:=
dev-libs/elfutils
dev-libs/libconfig:=[cxx]
net-misc/lksctp-tools
net-libs/mbedtls:=
sci-libs/fftw:3.0=[cpu_flags_x86_avx=,cpu_flags_x86_fma3=,cpu_flags_x86_sse=]
bladerf? ( net-wireless/bladerf:= )
simcard? ( sys-apps/pcsc-lite )
soapysdr? ( net-wireless/soapysdr:= )
uhd? ( net-wireless/uhd:= )
zeromq? ( net-libs/zeromq:= )
"
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
src_prepare() {
eapply "${FILESDIR}"/srsran2_array.patch
eapply "${FILESDIR}"/srsran2_asn1_lib.patch
sed -i '/ -Werror"/d' CMakeLists.txt || die
#break upstream hijacking of cflags
sed -i \
-e 's/"GNU"/"NERF"/g' \
-e 's/"Clang"/"NERF"/g' \
-e 's/Ninja/NERF/g' \
-e 's/GNUCXX/NERF/g' \
-e 's/set(CMAKE_C_FLAGS/set(CMAKE_C_FLAGS_NERF/g' \
CMakeLists.txt
cmake_src_prepare
}
src_configure() {
#This may be a bad idea, and it is a bad idea for sure when other tests are failing
#-DENABLE_ALL_TEST="$(usex test)"
#-DENABLE_TTCN3="$(usex test)"
#Maybe make this one depend on zmq instead?
#-DENABLE_ZMQ_TEST="$(usex test)"
# Add missing srsGUI
#-DENABLE_GUI="$(usex gui)"
mycmakeargs=(
-DENABLE_UHD="$(usex uhd)"
-DENABLE_BLADERF="$(usex bladerf)"
-DENABLE_SOAPYSDR="$(usex soapysdr)"
-DENABLE_ZEROMQ="$(usex zeromq)"
-DENABLE_HARDSIM="$(usex simcard)"
-DCMAKE_C_FLAGS_RELWITHDEBINFO="${CFLAGS}"
)
# readd nerfed cflags that are required
append-cflags "-std=c99 -fno-strict-aliasing -D_GNU_SOURCE"
append-cxxflags "-std=c++14 -fno-strict-aliasing -D_GNU_SOURCE"
# "fix" "auto-detection" from use flags, this is probably horrible
if use cpu_flags_x86_sse; then
append-cflags "-DLV_HAVE_SSE -mfpmath=sse -msse4.1"
append-cxxflags "-DLV_HAVE_SSE -mfpmath=sse -msse4.1"
fi
if use cpu_flags_x86_avx; then
append-cflags "-DLV_HAVE_AVX -mavx"
append-cxxflags "-DLV_HAVE_AVX -mavx"
fi
#if use cpu_flags_x86_avx2; then
# append-cflags "-DLV_HAVE_AVX2 -mavx2"
# append-cxxflags "-DLV_HAVE_AVX2 -mavx2"
#fi
#https://github.com/pentoo/pentoo-overlay/issues/1491
#if use cpu_flags_x86_avx512f; then
# append-cflags "-DLV_HAVE_AVX512 -mavx512f"
# append-cxxflags "-DLV_HAVE_AVX512 -mavx512f"
#fi
if use cpu_flags_x86_fma3; then
append-cflags "-DLV_HAVE_FMA -mfma"
append-cxxflags "-DLV_HAVE_FMA -mfma"
fi
cmake_src_configure
}
#FIXME:
# also, install the following include files:
#/usr/include/srsenb
#/usr/include/srsue

View file

@ -6,7 +6,7 @@ EAPI=8
inherit cmake flag-o-matic
DESCRIPTION="Open source SDR 4G software suite from Software Radio Systems"
HOMEPAGE="https://github.com/hdtuanss/srsRAN2"
HOMEPAGE="https://github.com/Miniman2718/srsRAN2"
# Possible issues to look into
#https://bugs.gentoo.org/713684
@ -14,8 +14,8 @@ HOMEPAGE="https://github.com/hdtuanss/srsRAN2"
#https://bugs.gentoo.org/733662
#https://bugs.gentoo.org/832618
HASH_COMMIT="0acc79d3fe5b153a18b62e8ef5af1a0fb2327a18"
SRC_URI="https://github.com/hdtuanss/srsRAN2/archive/${HASH_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
HASH_COMMIT="1a11387abc517bff4107fa0da3d9348945584f6c"
SRC_URI="https://github.com/Miniman2718/srsRAN2/archive/${HASH_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}/srsRAN2-${HASH_COMMIT}"
LICENSE="GPL-3"
@ -43,7 +43,7 @@ RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
src_prepare() {
eapply "${FILESDIR}"/srsran2_array.patch
# eapply "${FILESDIR}"/srsran2_array.patch
eapply "${FILESDIR}"/srsran2_asn1_lib.patch
sed -i '/ -Werror"/d' CMakeLists.txt || die
@ -74,11 +74,13 @@ src_configure() {
-DENABLE_SOAPYSDR="$(usex soapysdr)"
-DENABLE_ZEROMQ="$(usex zeromq)"
-DENABLE_HARDSIM="$(usex simcard)"
-DCMAKE_C_FLAGS_RELWITHDEBINFO="${CFLAGS}"
-DCMAKE_C_STANDARD=99
-DCMAKE_CXX_STANDARD=14
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
)
# readd nerfed cflags that are required
append-cflags "-std=c99 -fno-strict-aliasing -D_GNU_SOURCE"
append-cxxflags "-std=c++14 -fno-strict-aliasing -D_GNU_SOURCE"
append-cflags "-fno-strict-aliasing -D_GNU_SOURCE"
append-cxxflags "-fno-strict-aliasing -D_GNU_SOURCE"
# "fix" "auto-detection" from use flags, this is probably horrible
if use cpu_flags_x86_sse; then
append-cflags "-DLV_HAVE_SSE -mfpmath=sse -msse4.1"