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)" <[email protected]> +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(
