From patchwork Tue Feb 4 21:59:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1233581 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=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=ls7/huDR; dkim-atps=neutral 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 48BzBq2TWBz9sRQ for ; Wed, 5 Feb 2020 09:00:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3DCB983F07; Tue, 4 Feb 2020 22:00:01 +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 s811-vq9RxXH; Tue, 4 Feb 2020 22:00:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 99A8C83F35; Tue, 4 Feb 2020 22:00:00 +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 AEB461BF271 for ; Tue, 4 Feb 2020 21:59:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AB58F84031 for ; Tue, 4 Feb 2020 21:59:59 +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 m7FYXRac088g for ; Tue, 4 Feb 2020 21:59:58 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id EF6DC810B5 for ; Tue, 4 Feb 2020 21:59:57 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id u6so22549wrt.0 for ; Tue, 04 Feb 2020 13:59:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dT0vAeyBbMIRwr+fTbTmoL0IQxlBPzD5s8EK6yDsie8=; b=ls7/huDRzqhPjHtkiGW/mhgkyHMWzcSs033zWjCnUNDAESn4DlcAV7RYSWIZmZ1UR3 ESDs4Uboi69hmvXkX85Y1RBmiqywZAxIb449vJyk7xe9fejtk6bg2hInEjA23K1Z9si7 ZVOOhbrhIRiut2ylYKRt7uYFVBPlHIWqtEOXxp+4UOWHQbJnKcpAxeS/dfHx7WtHfZh8 I+dSGeIb+izK2U4s3C5lIJ6GBHI/KSrDYruAHS+0g7Q+F1YgeohxPTQfde0TJHsB9+R5 AKK0O5cwhKOjMmqCma7DS7R5HXkWVtVthp82ZtcbcW7ooq+wrQ3QCwPG2KyTWT9WzW60 8qnQ== 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=dT0vAeyBbMIRwr+fTbTmoL0IQxlBPzD5s8EK6yDsie8=; b=naG0hgQj3be3Tum0ufTLjD5uTufJ1MJZg3I4DaBgXi6OWdz85ojZQ4H2fKqlQnRps3 3CeNSZ7IpOqmilNgFFa0T2Emo864FbR8/1uKxPvWqmsmcCv83z3E4E6QHC+fG6tzYzhv tQrHocpD0cGZ4H3FKNw1rrTjYK6kMc5mCZF73katuZ5F2NVkjD4VqVCfLmygJObh2/+4 kJFdipZ/8v8z0SzLIZIV3Wa83zdxdv3jAZZOF72PutwOYLSpjPyXKAwgw5/rCt8geCj6 vrzVjzIJUCk795vNLX/UfU/y/jFCo/sxx2N6PTwjY85xisV5xFHQbclpwqRxTqtHtZDi xa4A== X-Gm-Message-State: APjAAAVUddSy3ySatXfzD/l09lBPI0HG+OH4w6WzNRI9DRyO6b6gTszR eC/t7iZ40we4o9tRYIYbXh+lZfuA9Hg= X-Google-Smtp-Source: APXvYqyWds0H7ua+cn+sQ9FW6xJyRRIzSRmicwk7Zs27uitTpYSW2bPh0yEMMbSVY/gf7QA/g3YVWQ== X-Received: by 2002:adf:ea4d:: with SMTP id j13mr19592452wrn.292.1580853596145; Tue, 04 Feb 2020 13:59:56 -0800 (PST) Received: from localhost.localdomain (cust-12-4-109-94.dyn.as47377.net. [94.109.4.12]) by smtp.gmail.com with ESMTPSA id s8sm5898608wmf.45.2020.02.04.13.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2020 13:59:55 -0800 (PST) From: Titouan Christophe To: buildroot@buildroot.org Date: Tue, 4 Feb 2020 22:59:50 +0100 Message-Id: <20200204215950.28789-1-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/pkg-waf: use host-python3 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: "Yann E . MORIN" , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This is the last of an unconsolidated series of patches that removes the need for host-python(2) for all waf-based packages. Signed-off-by: Titouan Christophe Reviewed-by: Romain Naour --- NB: this patch should be merged after the following patches are merged first: - gst1-imx (https://patchwork.ozlabs.org/patch/1233580/) - libimxvpuapi (https://patchwork.ozlabs.org/patch/1233460/) - norm (https://patchwork.ozlabs.org/project/buildroot/list/?series=156705) Dear committers, very sorry for that. I wasn't sure to finish on time to make a single waf python3 series. --- package/pkg-waf.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index a32d5dab33..35e56d3c13 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -36,8 +36,8 @@ define inner-waf-package -# We need host-python to run waf -$(2)_DEPENDENCIES += host-python +# We need host-python3 to run waf +$(2)_DEPENDENCIES += host-python3 $(2)_NEEDS_EXTERNAL_WAF ?= NO @@ -63,7 +63,7 @@ define $(2)_CONFIGURE_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_CONFIGURE_OPTS) \ $$($(2)_CONF_ENV) \ - $$(HOST_DIR)/bin/python2 $$($(2)_WAF) configure \ + $$(HOST_DIR)/bin/python3 $$($(2)_WAF) configure \ --prefix=/usr \ --libdir=/usr/lib \ $$($(2)_CONF_OPTS) \ @@ -78,7 +78,7 @@ endif ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ $$($(2)_WAF_OPTS) endef @@ -91,7 +91,7 @@ endif ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ install --destdir=$$(STAGING_DIR) \ $$($(2)_INSTALL_STAGING_OPTS) \ $$($(2)_WAF_OPTS) @@ -105,7 +105,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ install --destdir=$$(TARGET_DIR) \ $$($(2)_INSTALL_TARGET_OPTS) \ $$($(2)_WAF_OPTS)