From patchwork Sun Mar 31 12:18:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1071625 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="e6xuMXa4"; dkim-atps=neutral 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 44XDzH1BC6z9sQm for ; Sun, 31 Mar 2019 23:18:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 62B1286DAD; Sun, 31 Mar 2019 12:18:49 +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 wWsj38LzC+Hf; Sun, 31 Mar 2019 12:18:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6C7D586DB0; Sun, 31 Mar 2019 12:18:48 +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 D17241BF4DA for ; Sun, 31 Mar 2019 12:18:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C813C2207F for ; Sun, 31 Mar 2019 12:18:47 +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 nwkbOcOKuJW9 for ; Sun, 31 Mar 2019 12:18:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by silver.osuosl.org (Postfix) with ESMTPS id AC34121538 for ; Sun, 31 Mar 2019 12:18:45 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id q1so8269230wrp.0 for ; Sun, 31 Mar 2019 05:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CqSJLw3xCMcFFh6Ulsq8u0rL61At56P7whbBxDZjUUc=; b=e6xuMXa43VUjwBxMFY94giO4x1wTx4mpMIbqucfvE0AxP/QVpHcF8mwfsOQ0ojjCby ROqro335A+jz71mfDYhDoBVdm/jjJuKgp7vbnLunZHjJ6OHcr4AKbVKecpfrbcjYC4yL UgVd3TFF9z9h1gzUl7besHBeS1R4ZxooE1B8Tc/uHVxlcnZGY4ffg6EVNndl0zyt4tX6 SsXj1a5CFLKwq/2MRgPJi2xhrvbPSezrE5T4JO2SaeYUEtFQTDSWJ7cnkbZp82pKVtry LS50L13hS5ZGw4SMqXFrtAeYR3NV+WM7DYP7XRgP14IoBi2SZKLomTmU1UWP7F6CgMPr Q5dw== 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:mime-version :content-transfer-encoding; bh=CqSJLw3xCMcFFh6Ulsq8u0rL61At56P7whbBxDZjUUc=; b=JPCcYlnzRJWkqiy9jc5jLMM3rzx+lu1dJxw9oZ2nx6wwlrwB5jsbCqx6S5U3mPXfPW epgMzxKKLVCM3Rpg9GHeZKBRcRHgTGzYJLhJM6U6lWdy+zGzSPs6EjnAgT9LPRGuT/Yr g+f1hdc5/11wo9PxzQdB25nk6kpgeeJdr3Klc8DxjNBz0lDfAXKN39aYc0tpGHnGxq4B 0xtelld+HWjoNyGpljiRJviigE17cr8qNOrLN6ZM+lqFkxOQWtNAqKWfNu6Vj6Exi16j xztIBX6tHBFKvmMUaYlusbNY3OfIcVbYXEmPaFAamxXx0rKHM8OkhAai1bnLLVy937FO fM5Q== X-Gm-Message-State: APjAAAXs0oNniDM8Ar7d/D3iloxGGna+ZtSwHUt2q33UGdRKqe5xWyLS XbMex9rV/qN68YUx5a6i2cfT3yOL X-Google-Smtp-Source: APXvYqzdGU897uUBUFcR5UnrPPEjnqwxiJZ1yeC9J1x9ZieQ++0STArB01i+wtQt1Cvhm1jMAIRgtg== X-Received: by 2002:adf:c002:: with SMTP id z2mr39314941wre.177.1554034723780; Sun, 31 Mar 2019 05:18:43 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id 61sm28122769wre.50.2019.03.31.05.18.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Mar 2019 05:18:42 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 31 Mar 2019 14:18:10 +0200 Message-Id: <20190331121810.28608-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/scons: remove python from SCONS 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: Thomas Petazzoni , David Bender , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove $(HOST_DIR)/bin/python from SCONS variable to allow each scons package to select their python interpreter. Indeed, most of the scons packages (alljoyn, benejson, gpsd) only supports python2 Fixes: - http://autobuild.buildroot.org/results/b45f9fb69615b80758adeff4571e170c3bd9356b - http://autobuild.buildroot.org/results/13144a7ebd64ef7889312053f06a14047eea232d Signed-off-by: Fabrice Fontaine --- package/alljoyn-base/alljoyn-base.mk | 4 ++-- package/alljoyn-tcl-base/alljoyn-tcl-base.mk | 4 ++-- package/alljoyn-tcl/alljoyn-tcl.mk | 4 ++-- package/alljoyn/alljoyn.mk | 4 ++-- package/benejson/benejson.mk | 4 ++-- package/gpsd/gpsd.mk | 10 +++++----- package/mongodb/mongodb.mk | 4 ++-- package/scons/scons.mk | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package/alljoyn-base/alljoyn-base.mk b/package/alljoyn-base/alljoyn-base.mk index ad19802823..64ba647ab0 100644 --- a/package/alljoyn-base/alljoyn-base.mk +++ b/package/alljoyn-base/alljoyn-base.mk @@ -11,7 +11,7 @@ ALLJOYN_BASE_SITE = \ # See https://allseenalliance.org/alliance/ip-policy ALLJOYN_BASE_LICENSE = ISC -ALLJOYN_BASE_DEPENDENCIES = host-scons alljoyn openssl +ALLJOYN_BASE_DEPENDENCIES = host-python host-scons alljoyn openssl ALLJOYN_BASE_INSTALL_STAGING = YES ALLJOYN_BASE_CRYPTO = openssl @@ -68,7 +68,7 @@ endif define ALLJOYN_BASE_BUILD_CMDS $(foreach target,$(ALLJOYN_BASE_TARGETS),\ - cd $(@D)/$(target); $(SCONS) $(ALLJOYN_BASE_SCONS_OPTS) + cd $(@D)/$(target); $(HOST_DIR)/bin/python2 $(SCONS) $(ALLJOYN_BASE_SCONS_OPTS) ) endef diff --git a/package/alljoyn-tcl-base/alljoyn-tcl-base.mk b/package/alljoyn-tcl-base/alljoyn-tcl-base.mk index 461cd097d6..f8ef5a3e10 100644 --- a/package/alljoyn-tcl-base/alljoyn-tcl-base.mk +++ b/package/alljoyn-tcl-base/alljoyn-tcl-base.mk @@ -12,7 +12,7 @@ ALLJOYN_TCL_BASE_SITE = \ # See https://allseenalliance.org/alliance/ip-policy ALLJOYN_TCL_BASE_LICENSE = ISC -ALLJOYN_TCL_BASE_DEPENDENCIES = host-scons alljoyn-tcl +ALLJOYN_TCL_BASE_DEPENDENCIES = host-python host-scons alljoyn-tcl ALLJOYN_TCL_BASE_INSTALL_STAGING = YES # AllJoyn Base Thin Core can be compiled in debug or release mode. By default, @@ -29,7 +29,7 @@ ALLJOYN_TCL_BASE_SCONS_OPTS = \ WS=off define ALLJOYN_TCL_BASE_BUILD_CMDS - cd $(@D); $(SCONS) $(ALLJOYN_TCL_BASE_SCONS_OPTS) + cd $(@D); $(HOST_DIR)/bin/python2 $(SCONS) $(ALLJOYN_TCL_BASE_SCONS_OPTS) endef define ALLJOYN_TCL_BASE_INSTALL_STAGING_CMDS diff --git a/package/alljoyn-tcl/alljoyn-tcl.mk b/package/alljoyn-tcl/alljoyn-tcl.mk index cabdf8992a..8981ead378 100644 --- a/package/alljoyn-tcl/alljoyn-tcl.mk +++ b/package/alljoyn-tcl/alljoyn-tcl.mk @@ -12,7 +12,7 @@ ALLJOYN_TCL_SITE = \ # See https://allseenalliance.org/alliance/ip-policy ALLJOYN_TCL_LICENSE = ISC -ALLJOYN_TCL_DEPENDENCIES = host-scons +ALLJOYN_TCL_DEPENDENCIES = host-python host-scons ALLJOYN_TCL_INSTALL_STAGING = YES # AllJoyn Thin Core can be compiled in debug or release mode. By default, @@ -27,7 +27,7 @@ ALLJOYN_TCL_SCONS_OPTS = \ CXX="$(TARGET_CXX)" define ALLJOYN_TCL_BUILD_CMDS - cd $(@D); $(SCONS) $(ALLJOYN_TCL_SCONS_OPTS) + cd $(@D); $(HOST_DIR)/bin/python2 $(SCONS) $(ALLJOYN_TCL_SCONS_OPTS) endef define ALLJOYN_TCL_INSTALL_STAGING_CMDS diff --git a/package/alljoyn/alljoyn.mk b/package/alljoyn/alljoyn.mk index 1281674e38..d05705c429 100644 --- a/package/alljoyn/alljoyn.mk +++ b/package/alljoyn/alljoyn.mk @@ -11,7 +11,7 @@ ALLJOYN_SITE = https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_REV) # See https://allseenalliance.org/alliance/ip-policy ALLJOYN_LICENSE = ISC -ALLJOYN_DEPENDENCIES = host-scons libcap +ALLJOYN_DEPENDENCIES = host-python host-scons libcap ALLJOYN_INSTALL_STAGING = YES # AllJoyn can be compiled in debug or release mode. By default, AllJoyn is built @@ -51,7 +51,7 @@ ALLJOYN_SCONS_OPTS = \ TARGET_PATH="$(BR_PATH)" define ALLJOYN_BUILD_CMDS - cd $(@D); $(SCONS) $(ALLJOYN_SCONS_OPTS) + cd $(@D); $(HOST_DIR)/bin/python2 $(SCONS) $(ALLJOYN_SCONS_OPTS) endef define ALLJOYN_INSTALL_STAGING_CMDS diff --git a/package/benejson/benejson.mk b/package/benejson/benejson.mk index 680e5b5bda..0faf5f1cc4 100644 --- a/package/benejson/benejson.mk +++ b/package/benejson/benejson.mk @@ -9,7 +9,7 @@ BENEJSON_SITE = $(call github,codehero,benejson,$(BENEJSON_VERSION)) BENEJSON_LICENSE = MIT BENEJSON_LICENSE_FILES = LICENSE BENEJSON_INSTALL_STAGING = YES -BENEJSON_DEPENDENCIES = host-scons +BENEJSON_DEPENDENCIES = host-python host-scons # wchar support needs to be manually disabled ifeq ($(BR2_USE_WCHAR),) @@ -41,7 +41,7 @@ endif # Shared enabled define BENEJSON_BUILD_CMDS (cd $(@D); \ $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ - $(SCONS) $(BENEJSON_SCONS_TARGETS)) + $(HOST_DIR)/bin/python2 $(SCONS) $(BENEJSON_SCONS_TARGETS)) endef define BENEJSON_INSTALL_STAGING_CMDS diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 48d21348b9..0a17ddc93e 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -10,7 +10,7 @@ GPSD_LICENSE = BSD-3-Clause GPSD_LICENSE_FILES = COPYING GPSD_INSTALL_STAGING = YES -GPSD_DEPENDENCIES = host-scons host-pkgconf +GPSD_DEPENDENCIES = host-python host-scons host-pkgconf GPSD_LDFLAGS = $(TARGET_LDFLAGS) GPSD_CFLAGS = $(TARGET_CFLAGS) @@ -206,7 +206,7 @@ GPSD_SCONS_ENV += LDFLAGS="$(GPSD_LDFLAGS)" CFLAGS="$(GPSD_CFLAGS)" define GPSD_BUILD_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ - $(SCONS) \ + $(HOST_DIR)/bin/python2 $(SCONS) \ $(GPSD_SCONS_OPTS)) endef @@ -214,7 +214,7 @@ define GPSD_INSTALL_TARGET_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ DESTDIR=$(TARGET_DIR) \ - $(SCONS) \ + $(HOST_DIR)/bin/python2 $(SCONS) \ $(GPSD_SCONS_OPTS) \ install) endef @@ -228,7 +228,7 @@ define GPSD_INSTALL_STAGING_CMDS (cd $(@D); \ $(GPSD_SCONS_ENV) \ DESTDIR=$(STAGING_DIR) \ - $(SCONS) \ + $(HOST_DIR)/bin/python2 $(SCONS) \ $(GPSD_SCONS_OPTS) \ install) endef @@ -240,7 +240,7 @@ define GPSD_INSTALL_UDEV_RULES (cd $(@D); \ $(GPSD_SCONS_ENV) \ DESTDIR=$(TARGET_DIR) \ - $(SCONS) \ + $(HOST_DIR)/bin/python2 $(SCONS) \ $(GPSD_SCONS_OPTS) \ udev-install) chmod u+w $(TARGET_DIR)/lib/udev/rules.d/25-gpsd.rules diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk index e420ecb41d..53e1ce9963 100644 --- a/package/mongodb/mongodb.mk +++ b/package/mongodb/mongodb.mk @@ -74,7 +74,7 @@ endif define MONGODB_BUILD_CMDS (cd $(@D); \ - $(SCONS) \ + $(HOST_DIR)/bin/python $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ $(MONGODB_SCONS_TARGETS)) @@ -82,7 +82,7 @@ endef define MONGODB_INSTALL_TARGET_CMDS (cd $(@D); \ - $(SCONS) \ + $(HOST_DIR)/bin/python $(SCONS) \ $(MONGODB_SCONS_ENV) \ $(MONGODB_SCONS_OPTS) \ --prefix=$(TARGET_DIR)/usr \ diff --git a/package/scons/scons.mk b/package/scons/scons.mk index f146fde904..6533811db7 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -16,4 +16,4 @@ HOST_SCONS_INSTALL_OPTS = \ $(eval $(host-python-package)) # variables used by other packages -SCONS = $(HOST_DIR)/bin/python $(HOST_DIR)/bin/scons $(if $(QUIET),-s) +SCONS = $(HOST_DIR)/bin/scons $(if $(QUIET),-s)