summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Huettel <dilfridge@gentoo.org>2021-01-01 12:16:21 +0200
committerAndreas K. Huettel <dilfridge@gentoo.org>2021-01-01 12:28:34 +0200
commitb6dbb3f4e857cc95c777f582bed9bbf32743e0cf (patch)
treed2ebabaf455d16ea15c5c0b8d2a7e31f29ce8310
parentnet-libs/libosmocore: Apply -fcommon workaround (diff)
downloadgentoo-b6dbb3f4.tar.gz
gentoo-b6dbb3f4.tar.bz2
gentoo-b6dbb3f4.zip
net-wireless/bladerf: Fix build with gcc-10
Closes: https://bugs.gentoo.org/706664 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas K. Huettel <dilfridge@gentoo.org>
-rw-r--r--net-wireless/bladerf/bladerf-2019.07.ebuild6
-rw-r--r--net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch23
2 files changed, 28 insertions, 1 deletions
diff --git a/net-wireless/bladerf/bladerf-2019.07.ebuild b/net-wireless/bladerf/bladerf-2019.07.ebuild
index 3672b069b037..675b62ecbef4 100644
--- a/net-wireless/bladerf/bladerf-2019.07.ebuild
+++ b/net-wireless/bladerf/bladerf-2019.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -41,6 +41,10 @@ RDEPEND="${CDEPEND}"
PDEPEND=">=net-wireless/bladerf-firmware-2.3.2
>=net-wireless/bladerf-fpga-0.11.0"
+PATCHES=(
+ "${FILESDIR}/${P}-gcc10.patch"
+)
+
src_unpack() {
if [ "${PV}" = "9999" ]; then
git-r3_src_unpack
diff --git a/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch b/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
new file mode 100644
index 000000000000..bdd99c5cadcc
--- /dev/null
+++ b/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
@@ -0,0 +1,23 @@
+From 5cf9fd299a396a5ae5b4402215713fd2a84e607b Mon Sep 17 00:00:00 2001
+From: Robert Ghilduta <robert.ghilduta@nuand.com>
+Date: Mon, 25 May 2020 21:36:50 -0500
+Subject: [PATCH] libbladeRF: define bladerf2_state_to_string as extern in
+ header
+
+---
+ host/libraries/libbladeRF/src/board/bladerf2/common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/host/libraries/libbladeRF/src/board/bladerf2/common.h b/host/libraries/libbladeRF/src/board/bladerf2/common.h
+index 23187ba6c..efbebc867 100644
+--- a/host/libraries/libbladeRF/src/board/bladerf2/common.h
++++ b/host/libraries/libbladeRF/src/board/bladerf2/common.h
+@@ -207,7 +207,7 @@ extern const float ina219_r_shunt;
+ /* Constants */
+ /******************************************************************************/
+
+-char const *bladerf2_state_to_string[4];
++extern char const *bladerf2_state_to_string[4];
+
+
+ /******************************************************************************/