From patchwork Sun Oct 27 18:46:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1185105 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.b="jEmf0AO6"; 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 471RfX26y6z9sP4 for ; Mon, 28 Oct 2019 05:47:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 298358453B; Sun, 27 Oct 2019 18:47:13 +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 V-5XCsglb4kC; Sun, 27 Oct 2019 18:47:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6C7C984542; Sun, 27 Oct 2019 18:47:12 +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 103F21BF35B for ; Sun, 27 Oct 2019 18:47:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 057992038A for ; Sun, 27 Oct 2019 18:47:11 +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 VkKDxLOaCiuk for ; Sun, 27 Oct 2019 18:47:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by silver.osuosl.org (Postfix) with ESMTPS id 6EE6720008 for ; Sun, 27 Oct 2019 18:47:09 +0000 (UTC) Received: by mail-wm1-f51.google.com with SMTP id g24so7180090wmh.5 for ; Sun, 27 Oct 2019 11:47:09 -0700 (PDT) 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=tQ9kJHg/CHyanC/AiWfvvQhNtNn8Ezsu0LV+b347oqk=; b=jEmf0AO6d25RXweMcaYBM1TyHzZQDyCQGBAb04OTjwxBfAaMJ25FU3xYeCNwdTbN16 Ig1aiR6m+QVU7oPe+pKFX5kWbkAH9y9j6M2pw4k+2bGCpVkUtd+M8ZUorMJ07WlYSmub N2m3eWv8WzIITgdwA5zooCVvMxZvQ88jmPUP/lYD9nxUrkN3NLLOEMNPdjv/eYRDhM9w KWrHw3PVTUdQ3KRuoiUitqFFAGF36qJUhHhglp9o33gkHbZJqSSFjn7/oVuJjQUg6n47 6KNQHGxP7IDr1Q0XHoan2p71385jWDy18lthYttgB3Ddhj2We44uzceiBqyN2lc8V7t2 RdWQ== 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=tQ9kJHg/CHyanC/AiWfvvQhNtNn8Ezsu0LV+b347oqk=; b=jj5KTPXXaNQKkJ/BFzYHr+PuHPftzKrVONFE1RP0V1TK4cU2Opq2w6imkXEuAhQNph Pk+sdqs/W7P25iyjYEnt1aQhUztgr/EGLbrCfBLBbgxg5U9TOOyeIg/0/5qHBLpRxw2g u2SlLghPP1On36oB4CPNBzRNmn3jsRzEp8ttb2Mmhy8LbNIPgRYZYGO1r7LEbkSs9LEL usKJh6yru0UsrtXpFwKgowzispdTraB4xQa+QkZMHwchVflBKsuYQbvxt7Fa4Ed2BCLD W4+K+BPgBLH/pii1rTyIBdfHDIaZoeNFYJFG4b+48cPE9grhZ63GEz/DoAh5+SR77hjk +bXg== X-Gm-Message-State: APjAAAXsQXe9E78CWOQrldEwRR70bqstWewliq8koSjOy/YpzKF5vunL VMnpAkxbIKo9DrrJ3SN0gZshPcA7kwmSYA== X-Google-Smtp-Source: APXvYqx5fW1WQbw2wD1RMX4lGtH4dK2TxibIxXnwlXw2w52KjVyw0rkWeoeQ8AGnD0EGHunhS6ix5g== X-Received: by 2002:a1c:4046:: with SMTP id n67mr12414164wma.2.1572202027615; Sun, 27 Oct 2019 11:47:07 -0700 (PDT) Received: from taurus.dhcp.lyon.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id g5sm8924037wma.43.2019.10.27.11.47.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Oct 2019 11:47:07 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Sun, 27 Oct 2019 19:46:54 +0100 Message-Id: <20191027184654.118111-1-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/benejson: build using 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: David Bender , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Titouan Christophe --- ...-as-a-function-for-Py3-compatibility.patch | 31 +++++++++++++++++++ package/benejson/benejson.mk | 4 +-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch diff --git a/package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch b/package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch new file mode 100644 index 0000000000..287d7bf034 --- /dev/null +++ b/package/benejson/0002-Use-print-as-a-function-for-Py3-compatibility.patch @@ -0,0 +1,31 @@ +Use print as a function in SConstruct build file for Py3 compatibility. +This allow to run SCons on Python 3 + +[Upstream status: https://github.com/codehero/benejson/pull/12] + +Signed-off-by: Titouan Christophe +--- + benejson/SConscript | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/benejson/SConscript b/benejson/SConscript +index b7c5d10..80b4875 100644 +--- a/benejson/SConscript ++++ b/benejson/SConscript +@@ -9,11 +9,11 @@ lib_env = lib_env.Clone() + conf = Configure(lib_env) + + if not conf.CheckFunc("stpcpy"): +- print "Did not find stpcpy(), using bnj local version" ++ print("Did not find stpcpy(), using bnj local version") + conf.env.Append(CPPDEFINES = ["-Dstpcpy=bnj_local_stpcpy"]) + + if not conf.CheckFunc("stpncpy"): +- print "Did not find stpncpy(), using bnj local version" ++ print("Did not find stpncpy(), using bnj local version") + conf.env.Append(CPPDEFINES = ["-Dstpncpy=bnj_local_stpncpy"]) + lib_env = conf.Finish() + +-- +2.21.0 + diff --git a/package/benejson/benejson.mk b/package/benejson/benejson.mk index 0faf5f1cc4..5bb57d028d 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-python host-scons +BENEJSON_DEPENDENCIES = host-python3 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) \ - $(HOST_DIR)/bin/python2 $(SCONS) $(BENEJSON_SCONS_TARGETS)) + $(HOST_DIR)/bin/python3 $(SCONS) $(BENEJSON_SCONS_TARGETS)) endef define BENEJSON_INSTALL_STAGING_CMDS