From patchwork Fri Jan 17 11:02:30 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: 1224756 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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47zdTc04J3z9s29 for ; Fri, 17 Jan 2020 22:03:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CE38C866F2; Fri, 17 Jan 2020 11:03:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JaFUGNI0qkyH; Fri, 17 Jan 2020 11:03:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 303C8868D1; Fri, 17 Jan 2020 11:03:22 +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 AEA451BF380 for ; Fri, 17 Jan 2020 11:03:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AAA3785F53 for ; Fri, 17 Jan 2020 11:03:14 +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 kNoO+LGjsEFy for ; Fri, 17 Jan 2020 11:03:08 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8276685F9B for ; Fri, 17 Jan 2020 11:03:08 +0000 (UTC) Received: from localhost.localdomain (unknown [78.252.129.8]) by smtp3-g21.free.fr (Postfix) with ESMTP id DB73513F8E0; Fri, 17 Jan 2020 12:03:06 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Fri, 17 Jan 2020 12:02:30 +0100 Message-Id: <20200117110232.31336-4-gwenj@trabucayre.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200117110232.31336-1-gwenj@trabucayre.com> References: <20200117110232.31336-1-gwenj@trabucayre.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 4/6] package/gnuradio: add python3 support 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 gnuradio 3.8.0.0 support both python2 and python3. Signed-off-by: Gwenhael Goavec-Merou --- Changes v1 -> v2: * don't supress python2 support (Arnout) * add dependency to python2 or python3 to have correct python-mako version (Arnout) --- package/gnuradio/Config.in | 2 +- package/gnuradio/gnuradio.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 72458f0961..c8b8d62264 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -65,7 +65,7 @@ config BR2_PACKAGE_GNURADIO_FEC config BR2_PACKAGE_GNURADIO_PYTHON bool "python support" - depends on BR2_PACKAGE_PYTHON + depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_BOOST_PYTHON diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index a1dbb78e6e..41d4619f72 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -13,6 +13,7 @@ GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO # host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \ host-python-mako \ host-python-six \ host-swig \ @@ -107,7 +108,7 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) -GNURADIO_DEPENDENCIES += python +GNURADIO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF