From patchwork Sun Nov 1 16:32:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1391763 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=trabucayre.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CPM6d65Fmz9sRR for ; Mon, 2 Nov 2020 03:33:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1F0BC20436; Sun, 1 Nov 2020 16:33:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8CBY0-yR3BtO; Sun, 1 Nov 2020 16:33:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A5CA82035C; Sun, 1 Nov 2020 16:33:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 168611BF40A for ; Sun, 1 Nov 2020 16:33:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 135B3871C3 for ; Sun, 1 Nov 2020 16:33:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RMWp9ctry81E for ; Sun, 1 Nov 2020 16:33:03 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3541586D71 for ; Sun, 1 Nov 2020 16:33:03 +0000 (UTC) Received: from x230.trabucayre.com (unknown [IPv6:2a01:e34:efc8:1080:3e97:eff:fe89:644f]) by smtp2-g21.free.fr (Postfix) with ESMTP id D8B842003E8; Sun, 1 Nov 2020 17:32:58 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@buildroot.org Date: Sun, 1 Nov 2020 17:32:58 +0100 Message-Id: <20201101163258.32192-1-gwenj@trabucayre.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/gnuradio: fix qtgui build when gr-analog is not set X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gwenhael Goavec-Merou Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou gr-qtgui examples needs to have gr-analog enabled, without this dependency compile crash with: In file included from /x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.cc:22: /x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.h:24:10: fatal error: gnuradio/analog/noise_source.h: No such file or directory 24 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[3]: *** [gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/build.make:67: gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/display_qt.cc.o] Error 1 make[3]: *** Waiting for unfinished jobs.... In file included from /somewhere/gnuradio/build/gr-qtgui/examples/c++/moc_display_qt.cpp:10: /somewhere/gnuradio/build/gr-qtgui/examples/c++/../../../../gr-qtgui/examples/c++/display_qt.h:24:10: fatal error: gnuradio/analog/noise_source.h: No such file or directory 24 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. GR_ANALOG is not an explicit dependency of GR_QTGUI, so disable c++ examples if user has not selected this option. [backported from 7470a7a3771dd90defb826b464dfe62977cb1eb6] Fixes: - http://autobuild.buildroot.net/results/fde670499289f3d7d47379eebccf6e0f92c6d200/ Signed-off-by: Gwenhael Goavec-Merou --- ...add-examples-c-subdirectory-when-gr-.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/gnuradio/0004-gr-qtgui-dont-t-add-examples-c-subdirectory-when-gr-.patch diff --git a/package/gnuradio/0004-gr-qtgui-dont-t-add-examples-c-subdirectory-when-gr-.patch b/package/gnuradio/0004-gr-qtgui-dont-t-add-examples-c-subdirectory-when-gr-.patch new file mode 100644 index 0000000000..034c10c5cc --- /dev/null +++ b/package/gnuradio/0004-gr-qtgui-dont-t-add-examples-c-subdirectory-when-gr-.patch @@ -0,0 +1,55 @@ +From 268b1a599304f58bd56c86ff09041b5912c24a0c Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou +Date: Sun, 1 Nov 2020 17:24:36 +0100 +Subject: [PATCH] gr-qtgui: dont't add examples/c++ subdirectory when gr-analog + is disabled + +gr-qtgui examples needs to have gr-analog enabled, without this dependency +compile crash with: + +In file included from +/x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.cc:22: +/x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.h:24:10: +fatal error: gnuradio/analog/noise_source.h: No such file or directory +24 | #include +| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +compilation terminated. +make[3]: *** [gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/build.make:67: +gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/display_qt.cc.o] Error 1 +make[3]: *** Waiting for unfinished jobs.... +In file included from +/somewhere/gnuradio/build/gr-qtgui/examples/c++/moc_display_qt.cpp:10: +/somewhere/gnuradio/build/gr-qtgui/examples/c++/../../../../gr-qtgui/examples/c++/display_qt.h:24:10: +fatal error: gnuradio/analog/noise_source.h: No such file or directory +24 | #include +| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +compilation terminated. + +GR_ANALOG is not an explicit dependency of GR_QTGUI, so disable c++ examples if +user has not selected this option. + +[backported from 7470a7a3771dd90defb826b464dfe62977cb1eb6] + +Signed-off-by: Gwenhael Goavec-Merou +--- + gr-qtgui/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt +index 8831f3ad9..561186fbd 100644 +--- a/gr-qtgui/CMakeLists.txt ++++ b/gr-qtgui/CMakeLists.txt +@@ -68,7 +68,9 @@ if(ENABLE_GR_QTGUI) + add_subdirectory(include/gnuradio/qtgui) + add_subdirectory(lib) + add_subdirectory(docs) +-add_subdirectory(examples/c++) ++if (ENABLE_GR_ANALOG) ++ add_subdirectory(examples/c++) ++endif(ENABLE_GR_ANALOG) + if(ENABLE_PYTHON) + add_subdirectory(swig) + add_subdirectory(python/qtgui) +-- +2.26.2 +