From patchwork Fri Feb 26 16:09:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conrad Ratschan X-Patchwork-Id: 1444985 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=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=Xjo8FHFK; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DnF4Y44xRz9rx6 for ; Sat, 27 Feb 2021 03:10:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EC734433DA; Fri, 26 Feb 2021 16:10:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MuhVBua4GXtv; Fri, 26 Feb 2021 16:10:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 1F05C433C7; Fri, 26 Feb 2021 16:10:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 1CDC71BF292 for ; Fri, 26 Feb 2021 16:10:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0CA6B6F94E for ; Fri, 26 Feb 2021 16:10:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=rockwellcollins.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DA7Or-BWzRob for ; Fri, 26 Feb 2021 16:10:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from ch3vs05.rockwellcollins.com (ch3vs05.rockwellcollins.com [205.175.226.130]) by smtp3.osuosl.org (Postfix) with ESMTPS id E01AF60672 for ; Fri, 26 Feb 2021 16:10:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=PaDcTBlwpWqqBmsw+67RLahR6S/k87RJ8e4QbdbWp1M=; b=Xjo8FHFKRaMQ7lOeVCTC6gU+i9MM4cjwKyQkHkfkNn0a5O+EjXYtCLJU 2MOnIv2qr51pegOI9RgBTtP7K0XSymZpqs2K+VspjfPxII5aUAXc7WEZq luWY2XvzacFG8A4CEpF7Mex9lnk39cTM6kF68KyZglIoaQMyBVrfGJ/qW iMhYr9fxW7VgLTL17Rhg16qrs2OuokLFfG8b33VpUYIxqKd0x+cbQsD5J qUazIDEpc7vBKDqN1aCWjAzXIhmKgApCKDLOcw+X1FnrjHjthoK5Dt9kW TI5A7TRFoPq4aPtm6xTg7Pek5FDgk5wKvSiWLOQNazBydG/Hc23oYrarY A==; IronPort-SDR: eWhD93RW6qkkHBGBuUUb6GCQ4uX78zBUz4nhVq2VfOHRzV2E6bgGnHrxTaKsFPvFC39HwoWoNb w95tGihQN5m9ivadIS/uPVzSu+zqFSsNFSNpLztQ7W2hNzovhjODx9rEWCXEwVm6MD/XBTxyKg CCzeZDBqcKbwOITY5w6tCG1qXlirXEcfN02ZOVGEIKKFJBUP+taNwFILmaR9vVPgiVoS2JAT2r ac5t0slDzj+V14s8aAzOfCZH+p9uH5rSH4YRPoK9VTjwkFkn/cGBZ8Tz7nD3su2dv04hNJbIhv apk= Received: from ofwch3n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs05.rockwellcollins.com with ESMTP; 26 Feb 2021 10:10:17 -0600 X-Received: from eggs.rockwellcollins.com (eggs.rockwellcollins.lab [10.148.117.42]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id A353A20092; Fri, 26 Feb 2021 10:10:17 -0600 (CST) From: Conrad Ratschan To: buildroot@buildroot.org Date: Fri, 26 Feb 2021 10:09:36 -0600 Message-Id: <20210226160937.16082-3-conrad.ratschan@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210226160937.16082-1-conrad.ratschan@rockwellcollins.com> References: <20210226160937.16082-1-conrad.ratschan@rockwellcollins.com> Subject: [Buildroot] [PATCH 3/4] package/python3: Allow host-python ncurses 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: Conrad Ratschan , Thomas Petazzoni , Asaf Kahlon MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The Diffoscope tool has a runtime dependency on the curses module in Python. Buildroot disables curses support for host-python3. This patch allows for ncurses to be a configurable option for the host-python3 package like it is for the target python3 package. An additional patch is added to fix the ncurses include path as it previously was not correct when not cross compiling. Signed-off-by: Conrad Ratschan --- ...-ncurses-include-when-not-cross-comp.patch | 35 +++++++++++++++++++ package/python3/Config.in.host | 5 +++ package/python3/python3.mk | 8 ++++- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 package/python3/0035-configure.ac-Fix-ncurses-include-when-not-cross-comp.patch diff --git a/package/python3/0035-configure.ac-Fix-ncurses-include-when-not-cross-comp.patch b/package/python3/0035-configure.ac-Fix-ncurses-include-when-not-cross-comp.patch new file mode 100644 index 0000000000..15834772d0 --- /dev/null +++ b/package/python3/0035-configure.ac-Fix-ncurses-include-when-not-cross-comp.patch @@ -0,0 +1,35 @@ +From 9f10c2f660ab24d622b66a58d14dd7522b120d6d Mon Sep 17 00:00:00 2001 +From: Conrad Ratschan +Date: Tue, 2 Feb 2021 09:45:57 -0600 +Subject: [PATCH] configure.ac: Fix ncurses include when not cross compiling + +When not cross compiling, the ncurses include path used by configure.ac +is hardcoded to a path on the user's development machine. Change this +path to use ${prefix} so that it can use a host folder path specified +by Buildroot. + +Signed-off-by: Conrad Ratschan +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 07bceda..0398da5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5271,7 +5271,11 @@ fi + # first curses header check + ac_save_cppflags="$CPPFLAGS" + if test "$cross_compiling" = no; then +- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" ++ if test "x${prefix}" = "xNONE" ; then ++ CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" ++ else ++ CPPFLAGS="$CPPFLAGS -I${prefix}/include/ncursesw -I${prefix}/include/ncurses" ++ fi + fi + + AC_CHECK_HEADERS(curses.h ncurses.h) +-- +2.17.1 + diff --git a/package/python3/Config.in.host b/package/python3/Config.in.host index 70b5dacdde..dc463e51b6 100644 --- a/package/python3/Config.in.host +++ b/package/python3/Config.in.host @@ -13,4 +13,9 @@ config BR2_PACKAGE_HOST_PYTHON3_SSL help _ssl module for host Python3. +config BR2_PACKAGE_HOST_PYTHON3_CURSES + bool "curses" + help + curses module for Python3. + endif diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 63d6c3f535..9187fb8220 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -20,7 +20,6 @@ HOST_PYTHON3_CONF_OPTS += \ --disable-sqlite3 \ --disable-tk \ --with-expat=system \ - --disable-curses \ --disable-codecs-cjk \ --disable-nis \ --enable-unicodedata \ @@ -47,6 +46,13 @@ else HOST_PYTHON3_CONF_OPTS += --disable-openssl endif +ifeq ($(BR2_PACKAGE_HOST_PYTHON3_CURSES),y) +HOST_PYTHON3_DEPENDENCIES += host-ncurses +HOST_PYTHON3_CONF_OPTS += --enable-curses +else +HOST_PYTHON3_CONF_OPTS += --disable-curses +endif + PYTHON3_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_PYTHON3_2TO3),y)