commit: a654ea378d7756ab35188a11e44d17a68d33d433
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 3 16:17:34 2025 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Thu Apr 3 16:42:56 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a654ea37
net-wireless/soapysdr: Fix build with cmake4
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
.../soapysdr/files/soapysdr-0.8.1-cmake4.patch | 39 ++++++++++++++++++++++
...apysdr-9999.ebuild => soapysdr-0.8.1-r2.ebuild} | 10 +++++-
net-wireless/soapysdr/soapysdr-9999.ebuild | 10 +++++-
3 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/net-wireless/soapysdr/files/soapysdr-0.8.1-cmake4.patch
b/net-wireless/soapysdr/files/soapysdr-0.8.1-cmake4.patch
new file mode 100644
index 000000000000..a21cdf7da951
--- /dev/null
+++ b/net-wireless/soapysdr/files/soapysdr-0.8.1-cmake4.patch
@@ -0,0 +1,39 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ff15ad0..8fff872 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ ########################################################################
+ # Project setup
+ ########################################################################
+-cmake_minimum_required(VERSION 3.1.0)
++cmake_minimum_required(VERSION 3.10.0)
+ project(SoapySDR)
+ enable_language(CXX)
+ enable_testing()
+diff --git a/ExampleDriver/CMakeLists.txt b/ExampleDriver/CMakeLists.txt
+index 32cb6ca..ada07e9 100644
+--- a/ExampleDriver/CMakeLists.txt
++++ b/ExampleDriver/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ # Project setup -- only needed if device support is a stand-alone build
+ # We recommend that the support module be built in-tree with the driver.
+ ########################################################################
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.10.0)
+ project(SoapySDRMyDevice CXX)
+ enable_testing()
+
+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
+index 8cb1592..a5c09ce 100644
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ ########################################################################
+ # Project setup
+ ########################################################################
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.10.0)
+ project(SoapySDRPython CXX)
+ enable_testing()
+
diff --git a/net-wireless/soapysdr/soapysdr-9999.ebuild
b/net-wireless/soapysdr/soapysdr-0.8.1-r2.ebuild
similarity index 83%
copy from net-wireless/soapysdr/soapysdr-9999.ebuild
copy to net-wireless/soapysdr/soapysdr-0.8.1-r2.ebuild
index aaa41be56cc9..8f5ef69eb2ef 100644
--- a/net-wireless/soapysdr/soapysdr-9999.ebuild
+++ b/net-wireless/soapysdr/soapysdr-0.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -35,13 +35,21 @@ PDEPEND="
uhd? ( net-wireless/soapyuhd )
"
+PATCHES=(
+ "${FILESDIR}"/soapysdr-0.8.1-python3.12-distutils.patch
+ "${FILESDIR}"/soapysdr-0.8.1-cmake4.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_configure() {
local mycmakeargs=(
+ -DENABLE_PYTHON=$(usex python)
-DENABLE_PYTHON3=$(usex python)
+ -DBUILD_PYTHON3=$(usex python)
+ -DUSE_PYTHON_CONFIG=ON
)
cmake_src_configure
diff --git a/net-wireless/soapysdr/soapysdr-9999.ebuild
b/net-wireless/soapysdr/soapysdr-9999.ebuild
index aaa41be56cc9..8f5ef69eb2ef 100644
--- a/net-wireless/soapysdr/soapysdr-9999.ebuild
+++ b/net-wireless/soapysdr/soapysdr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -35,13 +35,21 @@ PDEPEND="
uhd? ( net-wireless/soapyuhd )
"
+PATCHES=(
+ "${FILESDIR}"/soapysdr-0.8.1-python3.12-distutils.patch
+ "${FILESDIR}"/soapysdr-0.8.1-cmake4.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_configure() {
local mycmakeargs=(
+ -DENABLE_PYTHON=$(usex python)
-DENABLE_PYTHON3=$(usex python)
+ -DBUILD_PYTHON3=$(usex python)
+ -DUSE_PYTHON_CONFIG=ON
)
cmake_src_configure
