From patchwork Thu Dec 5 23:11:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 1204876 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rockwellcollins.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47TWkx1tqSz9sPJ for ; Fri, 6 Dec 2019 10:14:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B71B688C71; Thu, 5 Dec 2019 23:14:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZlWJNBBktZ8U; Thu, 5 Dec 2019 23:14:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 183E988C6E; Thu, 5 Dec 2019 23:14:25 +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 DF4B01BF3CB for ; Thu, 5 Dec 2019 23:14:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D8746884A6 for ; Thu, 5 Dec 2019 23:14:23 +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 1yKzmVAj+HpV for ; Thu, 5 Dec 2019 23:14:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from ch3vs05.rockwellcollins.com (ch3vs05.rockwellcollins.com [205.175.226.130]) by whitealder.osuosl.org (Postfix) with ESMTPS id DB645884A3 for ; Thu, 5 Dec 2019 23:14:20 +0000 (UTC) IronPort-SDR: vQTohcFTrTDEulQwoe45fpl5ailobYRCpbXwMHgFmTe8DBc3DYXWDrdRvt4XmMQQp/CR3JbFs5 GFw8lca/Di/tNXc7zxfyqfnQxihi0N3aD0TiA4Jg0IV5D6j/BxdhLMg9BGDp8Pdo57JoH64D6w A9inDmSLiWI4lds/pB402/7ZhWW6insI2DOukvzcbqHuBwOt83Bmq2OtdZ9t5m/hpFK39S8cc9 vdJmCsv7g4EsnrFnIMiANRuPdJ0W4/DMOC7erxbGq776Q09xRQLTv1mdgDyQO3bgRkc0kAzaB6 YtU= Received: from ofwch3n02.rockwellcollins.com (HELO crulimr01.rockwellcollins.com) ([205.175.226.14]) by ch3vs05.rockwellcollins.com with ESMTP; 05 Dec 2019 17:11:16 -0600 X-Received: from bacon.rockwellcollins.com (unknown [192.168.6.146]) by crulimr01.rockwellcollins.com (Postfix) with ESMTP id C169760331; Thu, 5 Dec 2019 17:11:15 -0600 (CST) From: Ryan Barnett To: buildroot@buildroot.org Date: Thu, 5 Dec 2019 17:11:02 -0600 Message-Id: <20191205231103.27778-1-ryan.barnett@rockwellcollins.com> X-Mailer: git-send-email 2.18.0 Subject: [Buildroot] [PATCH] package/pkg-python: use _CONFIGURE_OPTS for build env 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: Ryan Barnett , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When building host or target python packages, we need to ensure that the build environment utilize {HOST|TARGET}_CONFIGURE_OPTS. This ensures that the correct linker and compiler environment variables are set to compile utilizing either the host or target folders. It was discovered that when compiling a host-python package, it was using linking against the build machines library folder instead of the host folder because LDFLAGS was not properly set and was improperly detecting whether or not a shared or static library was present in the host folder. CC: Arnout Vandecappelle Signed-off-by: Ryan Barnett --- Changes v1 -> v2: - Merged HOST/TARGET_CONFIGURE_OPTS to single commit (suggested by Arnout) - Added HOST/TARGET_CONFIGURE_OPTS to env for setuptools (suggested by Arnout) --- package/pkg-python.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index be1ce071df..4ded4fde83 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -27,9 +27,7 @@ endef # Target distutils-based packages PKG_PYTHON_DISTUTILS_ENV = \ PATH=$(BR_PATH) \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ + $(TARGET_CONFIGURE_OPTS) \ LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ PYTHONNOUSERSITE=1 \ @@ -52,7 +50,8 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ # Host distutils-based packages HOST_PKG_PYTHON_DISTUTILS_ENV = \ PATH=$(BR_PATH) \ - PYTHONNOUSERSITE=1 + PYTHONNOUSERSITE=1 \ + $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) @@ -61,6 +60,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ PKG_PYTHON_SETUPTOOLS_ENV = \ _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ + $(TARGET_CONFIGURE_OPTS) \ PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ PYTHONNOUSERSITE=1 \ _python_sysroot=$(STAGING_DIR) \ @@ -82,7 +82,8 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ # Host setuptools-based packages HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ PATH=$(BR_PATH) \ - PYTHONNOUSERSITE=1 + PYTHONNOUSERSITE=1 \ + $(HOST_CONFIGURE_OPTS) HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) \