From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp3.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 smtp.lore.kernel.org (Postfix) with ESMTPS id 26A0FC433F5 for ; Wed, 9 Feb 2022 16:53:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CE70260B05; Wed, 9 Feb 2022 16:53:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vNfKwAXx1Zol; Wed, 9 Feb 2022 16:53:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 1833660AEC; Wed, 9 Feb 2022 16:53:57 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 4EC4D1BF9BA for ; Wed, 9 Feb 2022 16:52:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 5AE3740150 for ; Wed, 9 Feb 2022 16:52:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fwC8Q6DhqnR0 for ; Wed, 9 Feb 2022 16:52:30 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by smtp2.osuosl.org (Postfix) with ESMTPS id EF78540146 for ; Wed, 9 Feb 2022 16:52:29 +0000 (UTC) Received: (Authenticated sender: peter@korsgaard.com) by mail.gandi.net (Postfix) with ESMTPSA id D93CE1BF209; Wed, 9 Feb 2022 16:52:26 +0000 (UTC) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1nHqCg-0001EK-F8; Wed, 09 Feb 2022 17:52:26 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 9 Feb 2022 17:50:35 +0100 Message-Id: <20220209165213.4498-10-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220209165213.4498-1-peter@korsgaard.com> References: <20220209165213.4498-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 009/107] package/dbus-python: drop python2 support X-BeenThere: buildroot@buildroot.org 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Peter Korsgaard --- package/dbus-python/Config.in | 8 +++----- package/dbus-python/dbus-python.mk | 28 ++++------------------------ 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in index 4bfb59ed91..76453e168a 100644 --- a/package/dbus-python/Config.in +++ b/package/dbus-python/Config.in @@ -3,16 +3,14 @@ config BR2_PACKAGE_DBUS_PYTHON depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_PACKAGE_DBUS - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_LIBGLIB2 - # pyexpat: runtime dependency only - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help Python bindings for D-Bus http://dbus.freedesktop.org/doc/dbus-python/ comment "dbus-python needs a toolchain w/ wchar, threads" - depends on BR2_PACKAGE_DBUS && (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) + depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON3 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk index 3e28aed25c..d9bb30ed67 100644 --- a/package/dbus-python/dbus-python.mk +++ b/package/dbus-python/dbus-python.mk @@ -9,40 +9,20 @@ DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python DBUS_PYTHON_INSTALL_STAGING = YES DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain) DBUS_PYTHON_LICENSE_FILES = COPYING dbus-gmain/COPYING -DBUS_PYTHON_DEPENDENCIES = dbus libglib2 -HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 +DBUS_PYTHON_DEPENDENCIES = dbus libglib2 python3 host-python3 +HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 host-python3 -ifeq ($(BR2_PACKAGE_PYTHON),y) -DBUS_PYTHON_DEPENDENCIES += python host-python - -DBUS_PYTHON_CONF_ENV += \ - PYTHON=$(HOST_DIR)/bin/python2 \ - PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`" - -HOST_DBUS_PYTHON_DEPENDENCIES += host-python - -HOST_DBUS_PYTHON_CONF_ENV += \ - PYTHON=$(HOST_DIR)/bin/python2 \ - PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python2-config --ldflags`" -else -DBUS_PYTHON_DEPENDENCIES += python3 host-python3 - -DBUS_PYTHON_CONF_ENV += \ +DBUS_PYTHON_CONF_ENV = \ PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" -HOST_DBUS_PYTHON_DEPENDENCIES += host-python3 - -HOST_DBUS_PYTHON_CONF_ENV += \ +HOST_DBUS_PYTHON_CONF_ENV = \ PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(HOST_DIR)/usr/bin/python3-config --libs --embed`" -endif $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.20.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot