From patchwork Tue Feb 4 14:24:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1233370 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mind.be Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind.be header.i=@mind.be header.a=rsa-sha256 header.s=google header.b=f0SP4CDs; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Bn7701cbzB3xT for ; Wed, 5 Feb 2020 01:26:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E7D3485721; Tue, 4 Feb 2020 14:26:08 +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 4vDpOriL9Jyc; Tue, 4 Feb 2020 14:26:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id EACDC85310; Tue, 4 Feb 2020 14:26:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 588311BF3D8 for ; Tue, 4 Feb 2020 14:26:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 54C24203A2 for ; Tue, 4 Feb 2020 14:26:05 +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 8hmgCL4Xlg3K for ; Tue, 4 Feb 2020 14:26:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by silver.osuosl.org (Postfix) with ESMTPS id 93B1720349 for ; Tue, 4 Feb 2020 14:26:03 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id y11so23293018wrt.6 for ; Tue, 04 Feb 2020 06:26:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SQNxDm0VQ9w3kyFWmQy7PbOlkUanSwPx4sT0xKlorUc=; b=f0SP4CDssOepIO3k9m+K0Ir8NlhyoDDmnnbW1Q0GwxPQXWT76k7k8sPo0H0F/jLBjX FSyjb/7kRp1e0OpgsA7p57aQmaUR6s9uHF/GFccqzASfNtMPP1oKIQmLSqujhFf1XoLH vzHParjba/X3mXB9udGJeKelNTVdOB+xk5xQx2d9otkSnMMfVHiUtLQXOyLcxrc0lq08 By66tpOrqRr9YWSXfQcv+GdDy2iKiyQ7eNqiJ0QJiqklLAFl5j9O16+M4T/CMOK8SOlb d5jHMz0xGyK4vM51pqw6f9dJSEFZ4l3eTAmFaancIFim1PnskLQw3G7WNxwbUZHYJ9bg ctMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SQNxDm0VQ9w3kyFWmQy7PbOlkUanSwPx4sT0xKlorUc=; b=eDa8tZ1J9fqFpRZEVRuF3JUP2U7dYiRotEyKDLuq6GDd5Fe55E0/DQH82GcgKCtguW NdpjXEv8As9vtKguBfc/aT2yqgdXlc/0YlCh4mvXF1hXn22cToKmLZw8itxpmOIF2Lpk nfQNmRJyY0INYosCE8LSLyrt1RVMqq8zHCaHsy9Tz/j6pJEoQdwDzTIDPTek1k9auH8R wgGqNos2v0B5dSBwaGkxzQj0OCBCWDJdroyfK0+khvMs+a2flzMizkcOUkJ0tKb04pzg 0A2vi1xrhwkVmO+W5LtwoG8y5uORU7QpmDGP5ii43ATiV5cwPYqrd9w+Lj8j6AUL2KQW A3Bw== X-Gm-Message-State: APjAAAVc6k9D6SndbXsqQaRTvhszeDdLgBMjuZOwJAe3vKvA04iunnnB yw2lA66B4HpPCKeTGpoBu+HGCRZ2IL8= X-Google-Smtp-Source: APXvYqy2cARCB+1gEXQRPoyjd76c65WknuRuyg3y8Pam6VlSIHfhnHEAQP+LRv989GHcHpq2GwDhRQ== X-Received: by 2002:a5d:484f:: with SMTP id n15mr22396716wrs.365.1580826361830; Tue, 04 Feb 2020 06:26:01 -0800 (PST) Received: from localhost.localdomain ([2620:0:1055:fd00:c6df:61c8:f82e:fd3c]) by smtp.gmail.com with ESMTPSA id w13sm30069071wru.38.2020.02.04.06.26.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2020 06:26:01 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Tue, 4 Feb 2020 15:24:55 +0100 Message-Id: <20200204142456.1537358-5-arnout@mind.be> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200204142456.1537358-1-arnout@mind.be> References: <20200204142456.1537358-1-arnout@mind.be> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/5] package/pkg-python: rely on python wrapper in HOST_BIN_CROSS 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: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since we now have a python wrapper in HOST_BIN_CROSS, we no longer need to set all these environment variables from the python-package infrastructure. Add HOST_BIN_CROSS to the PATH for target packages, and remove all environment variables which are already set by the wrapper. Use this python as the python that is used to run setup.py. PKG_PYTHON_SYSCONFIGDATA_NAME is no longer used so it can be removed. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-python.mk | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 4ded4fde83..93f24856bf 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -20,21 +20,11 @@ # ################################################################################ -define PKG_PYTHON_SYSCONFIGDATA_NAME -$(basename $(notdir $(wildcard $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/_sysconfigdata__linux_*.py))) -endef - # Target distutils-based packages PKG_PYTHON_DISTUTILS_ENV = \ - PATH=$(BR_PATH) \ + PATH=$(HOST_BIN_CROSS):$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ - PYTHONNOUSERSITE=1 \ - _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ --executable=/usr/bin/python @@ -58,14 +48,8 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ - _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ - PATH=$(BR_PATH) \ + PATH=$(HOST_BIN_CROSS):$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ - PYTHONNOUSERSITE=1 \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ --prefix=/usr \ @@ -225,7 +209,7 @@ endif # SETUP_TYPE # - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON. # ifeq ($(4),target) -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python +$(2)_PYTHON_INTERPRETER = $$(HOST_BIN_CROSS)/python else ifeq ($$($(2)_NEEDS_HOST_PYTHON),) $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python