* [gentoo-commits] repo/gentoo:master commit in: net-wireless/bladerf/files/, net-wireless/bladerf/
@ 2021-01-01 10:28 Andreas K. Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Hüttel @ 2021-01-01 10:28 UTC (permalink / raw
To: gentoo-commits
commit: b6dbb3f4e857cc95c777f582bed9bbf32743e0cf
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 1 10:16:21 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jan 1 10:28:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6dbb3f4
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 <AT> gentoo.org>
net-wireless/bladerf/bladerf-2019.07.ebuild | 6 +++++-
.../bladerf/files/bladerf-2019.07-gcc10.patch | 23 ++++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/net-wireless/bladerf/bladerf-2019.07.ebuild b/net-wireless/bladerf/bladerf-2019.07.ebuild
index 3672b069b03..675b62ecbef 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 00000000000..bdd99c5cadc
--- /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];
+
+
+ /******************************************************************************/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/bladerf/files/, net-wireless/bladerf/
@ 2021-08-01 18:17 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-08-01 18:17 UTC (permalink / raw
To: gentoo-commits
commit: a58196e74c351092efe79d43adc3c6c34a09fac9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 29 18:25:58 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 1 18:15:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a58196e7
net-wireless/bladerf: Drop 2019.07
Bug: https://bugs.gentoo.org/791526
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-wireless/bladerf/Manifest | 1 -
net-wireless/bladerf/bladerf-2019.07.ebuild | 65 ----------------------
.../bladerf/files/bladerf-2019.07-gcc10.patch | 23 --------
3 files changed, 89 deletions(-)
diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
index 6813e01a5f9..05da6cefc69 100644
--- a/net-wireless/bladerf/Manifest
+++ b/net-wireless/bladerf/Manifest
@@ -1,3 +1,2 @@
DIST analogdevices-no-OS-0bba46.tar.gz 44190321 BLAKE2B b5c31b4b9ed92e0ac9f1a4c1eda38e065f00e0ee8034a99615a2509a4c91c589faefaf2e42a8bd30e61eb36459fa264c6e1892577f759c2ca0810925cede163e SHA512 cf6f6d34fed9879ae7263782f20f33dd3af84201e3477fa0501e072eb08a8a545a07c496ad0ff3f7dc1a6ef407f136f843ba05942b4819e146c5fef023a3bb02
-DIST bladerf-2019.07.tar.gz 2186702 BLAKE2B 1d08dc90ddf5d5f650fdc49e5a7e4224de7caa988974c1252052975599066b2221741a2cd2f0ba496e98d63b6d417b0eb1ae12de4dd9a9d43fb730bb6b221dc2 SHA512 e6ba47106ac9904d41fc611560c8f4bc482b9f17b6c476d4a2ac36c5779e9a64222140f4f067fab2252ccfabebf74e866f0fefb359934ff4df7a8416a8558b87
DIST bladerf-2021.03.tar.gz 2261864 BLAKE2B b4e58e370c1e515162f01a0da3985b5ba3c210a8a045bd531e618a9da8e4e66e74a8ccca9138cf6427b512f9c4423bd4151cc63d70a5e218c2a24980afa73972 SHA512 76ebb6501ad9286c7a52a0540f991f7848e396b4d75104bf7186ffac5e3142aa79914352238c8a9e0b4453910c171218c0e861092f228202d0b236939fecc325
diff --git a/net-wireless/bladerf/bladerf-2019.07.ebuild b/net-wireless/bladerf/bladerf-2019.07.ebuild
deleted file mode 100644
index f3febfccacb..00000000000
--- a/net-wireless/bladerf/bladerf-2019.07.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils udev
-
-DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
-HOMEPAGE="https://nuand.com/"
-
-#lib is LGPL and cli tools are GPL
-LICENSE="GPL-2+ LGPL-2.1+"
-
-SLOT="0/${PV}"
-
-#maintainer notes:
-#doc use flag, looks like it can't be disabled right now and will
-# always build if pandoc and help2man are installed
-# also ignores when deps are missing and just disables docs
-IUSE="doc +tecla"
-
-MY_PN="bladeRF"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/Nuand/${MY_PN}.git"
-else
- MY_PV=${PV/\_/-}
- S="${WORKDIR}/${MY_PN}-${MY_PV}"
- SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz \
- https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz"
- KEYWORDS="amd64 ~arm x86"
-fi
-
-CDEPEND=">=dev-libs/libusb-1.0.16
- tecla? ( dev-libs/libtecla )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-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
- else
- default
- mv "${WORKDIR}/no-OS-0bba46e6f6f75785a65d425ece37d0a04daf6157/ad9361" "${S}/thirdparty/analogdevicesinc/no-OS/" || die
- fi
-}
-
-src_configure() {
- mycmakeargs=(
- -DVERSION_INFO_OVERRIDE:STRING="${PV}"
- -DBUILD_DOCUMENTATION="$(usex doc)"
- -DENABLE_LIBTECLA="$(usex tecla)"
- -DTREAT_WARNINGS_AS_ERRORS=OFF
- -DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
- )
- cmake-utils_src_configure
-}
diff --git a/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch b/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
deleted file mode 100644
index bdd99c5cadc..00000000000
--- a/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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];
-
-
- /******************************************************************************/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/bladerf/files/, net-wireless/bladerf/
@ 2023-02-17 14:06 Rick Farina
0 siblings, 0 replies; 3+ messages in thread
From: Rick Farina @ 2023-02-17 14:06 UTC (permalink / raw
To: gentoo-commits
commit: 3401d99be5943f55dba8a0fc932e34048fed4ce2
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 14:05:11 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 14:06:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3401d99b
net-wireless/bladerf: fix doc build
Thanks to DarthGandalf in gentoo-dev-help on irc
Closes: https://bugs.gentoo.org/800791
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/bladerf/bladerf-2023.02.ebuild | 2 ++
.../bladerf/files/bladerf-cmake-glob.patch | 40 ++++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/net-wireless/bladerf/bladerf-2023.02.ebuild b/net-wireless/bladerf/bladerf-2023.02.ebuild
index 1ffb9521e9da..0e056e6784c4 100644
--- a/net-wireless/bladerf/bladerf-2023.02.ebuild
+++ b/net-wireless/bladerf/bladerf-2023.02.ebuild
@@ -41,6 +41,8 @@ RDEPEND="${CDEPEND}
>=net-wireless/bladerf-firmware-2.4.0
>=net-wireless/bladerf-fpga-0.15.0"
+PATCHES=( "${FILESDIR}/bladerf-cmake-glob.patch" )
+
src_unpack() {
if [ "${PV}" = "9999" ]; then
git-r3_src_unpack
diff --git a/net-wireless/bladerf/files/bladerf-cmake-glob.patch b/net-wireless/bladerf/files/bladerf-cmake-glob.patch
new file mode 100644
index 000000000000..61a28468af19
--- /dev/null
+++ b/net-wireless/bladerf/files/bladerf-cmake-glob.patch
@@ -0,0 +1,40 @@
+From 12699a5cf89a00d63637eafc108515990d27c8fc Mon Sep 17 00:00:00 2001
+From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
+Date: Thu, 16 Feb 2023 12:04:13 -0500
+Subject: [PATCH] use file(GLOB) instead of just globbing
+
+While *.h works for make, it fails when using ninja. This fixes the bug
+using cmake's file(GLOB) as suggested by DarthGandalf in
+gentoo-dev-help on irc
+
+https://bugs.gentoo.org/800791
+---
+ host/libraries/libbladeRF/CMakeLists.txt | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/host/libraries/libbladeRF/CMakeLists.txt b/host/libraries/libbladeRF/CMakeLists.txt
+index 4000a1555..f280b07cd 100644
+--- a/host/libraries/libbladeRF/CMakeLists.txt
++++ b/host/libraries/libbladeRF/CMakeLists.txt
+@@ -540,13 +540,17 @@ if(BUILD_LIBBLADERF_DOCUMENTATION)
+
+ set(LOGO_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/doc/images/logo.png")
+
++ file(GLOB INCLUDE_H ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h)
++ file(GLOB DOC_DOX ${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/*.dox)
++ file(GLOB DOC_EXAMPLES ${CMAKE_CURRENT_SOURCE_DIR}/doc/examples/*)
++ file(GLOB DOC_IMAGES ${CMAKE_CURRENT_SOURCE_DIR}/doc/images/*)
+ set(DOXYGEN_SOURCE_FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/doc/doxygen/Doxyfile
+- ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h
+- ${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/*.dox
++ ${INCLUDE_H}
++ ${DOC_DOX}
+ ${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/layout.xml
+- ${CMAKE_CURRENT_SOURCE_DIR}/doc/examples/*
+- ${CMAKE_CURRENT_SOURCE_DIR}/doc/images/*
++ ${DOC_EXAMPLES}
++ ${DOC_IMAGES}
+ )
+
+ configure_file(
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-17 14:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-01 18:17 [gentoo-commits] repo/gentoo:master commit in: net-wireless/bladerf/files/, net-wireless/bladerf/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-02-17 14:06 Rick Farina
2021-01-01 10:28 Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox