Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/bladerf/files/, net-wireless/bladerf/
Date: Fri, 01 Jan 2021 10:28:58
Message-Id: 1609496914.b6dbb3f4e857cc95c777f582bed9bbf32743e0cf.dilfridge@gentoo
1 commit: b6dbb3f4e857cc95c777f582bed9bbf32743e0cf
2 Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 1 10:16:21 2021 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 1 10:28:34 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6dbb3f4
7
8 net-wireless/bladerf: Fix build with gcc-10
9
10 Closes: https://bugs.gentoo.org/706664
11 Package-Manager: Portage-3.0.9, Repoman-3.0.2
12 Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>
13
14 net-wireless/bladerf/bladerf-2019.07.ebuild | 6 +++++-
15 .../bladerf/files/bladerf-2019.07-gcc10.patch | 23 ++++++++++++++++++++++
16 2 files changed, 28 insertions(+), 1 deletion(-)
17
18 diff --git a/net-wireless/bladerf/bladerf-2019.07.ebuild b/net-wireless/bladerf/bladerf-2019.07.ebuild
19 index 3672b069b03..675b62ecbef 100644
20 --- a/net-wireless/bladerf/bladerf-2019.07.ebuild
21 +++ b/net-wireless/bladerf/bladerf-2019.07.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2020 Gentoo Authors
24 +# Copyright 1999-2021 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=7
28 @@ -41,6 +41,10 @@ RDEPEND="${CDEPEND}"
29 PDEPEND=">=net-wireless/bladerf-firmware-2.3.2
30 >=net-wireless/bladerf-fpga-0.11.0"
31
32 +PATCHES=(
33 + "${FILESDIR}/${P}-gcc10.patch"
34 +)
35 +
36 src_unpack() {
37 if [ "${PV}" = "9999" ]; then
38 git-r3_src_unpack
39
40 diff --git a/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch b/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
41 new file mode 100644
42 index 00000000000..bdd99c5cadc
43 --- /dev/null
44 +++ b/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
45 @@ -0,0 +1,23 @@
46 +From 5cf9fd299a396a5ae5b4402215713fd2a84e607b Mon Sep 17 00:00:00 2001
47 +From: Robert Ghilduta <robert.ghilduta@×××××.com>
48 +Date: Mon, 25 May 2020 21:36:50 -0500
49 +Subject: [PATCH] libbladeRF: define bladerf2_state_to_string as extern in
50 + header
51 +
52 +---
53 + host/libraries/libbladeRF/src/board/bladerf2/common.h | 2 +-
54 + 1 file changed, 1 insertion(+), 1 deletion(-)
55 +
56 +diff --git a/host/libraries/libbladeRF/src/board/bladerf2/common.h b/host/libraries/libbladeRF/src/board/bladerf2/common.h
57 +index 23187ba6c..efbebc867 100644
58 +--- a/host/libraries/libbladeRF/src/board/bladerf2/common.h
59 ++++ b/host/libraries/libbladeRF/src/board/bladerf2/common.h
60 +@@ -207,7 +207,7 @@ extern const float ina219_r_shunt;
61 + /* Constants */
62 + /******************************************************************************/
63 +
64 +-char const *bladerf2_state_to_string[4];
65 ++extern char const *bladerf2_state_to_string[4];
66 +
67 +
68 + /******************************************************************************/