From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp2.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 smtp.lore.kernel.org (Postfix) with ESMTPS id 71FC3C4345F for ; Mon, 29 Apr 2024 08:57:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 12B8740342; Mon, 29 Apr 2024 08:57:14 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id NO-SPgx54QB2; Mon, 29 Apr 2024 08:57:10 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 53BCA40439 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 53BCA40439; Mon, 29 Apr 2024 08:57:10 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id DD6F91BF315 for ; Mon, 29 Apr 2024 08:57:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D6E1240439 for ; Mon, 29 Apr 2024 08:57:07 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id hArSTNP_QYM2 for ; Mon, 29 Apr 2024 08:57:05 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:e0c:1:1599::12; helo=smtp3-g21.free.fr; envelope-from=yann.morin.1998@free.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org C166A402C3 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C166A402C3 Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [IPv6:2a01:e0c:1:1599::12]) by smtp2.osuosl.org (Postfix) with ESMTPS id C166A402C3 for ; Mon, 29 Apr 2024 08:57:03 +0000 (UTC) Received: from ymorin.is-a-geek.org (unknown [IPv6:2a01:cb19:8290:3800:e05a:3b8d:ff83:9629]) (Authenticated sender: yann.morin.1998@free.fr) by smtp3-g21.free.fr (Postfix) with ESMTPSA id A74C213F846; Mon, 29 Apr 2024 10:56:55 +0200 (CEST) Received: by ymorin.is-a-geek.org (sSMTP sendmail emulation); Mon, 29 Apr 2024 10:56:55 +0200 Date: Mon, 29 Apr 2024 10:56:55 +0200 From: "Yann E. MORIN" To: Vincent Fazio Message-ID: References: <20240428024210.11950-1-vfazio@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240428024210.11950-1-vfazio@gmail.com> X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1714381020; bh=YEbBrby2kjy9ZYKdNz8i+b9SCBy+ACCZk48YJNJmWiM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ikQS7tP3Nnjd+Cq5ixWW2UgXhsVSI2Q16Da+8ECtTUElU91SYWreFJaEJ0eFG4MVR dQ2qqohhgvqDhr5eS6SPvBoQGxnd/cbiTfsgYKwd+kxIsariGPXNr1xCqV+kRcUYig IoANyVyqKk3q0pK9SHlwl8y78iyu7CJfSCGceOePHQtGElHlCQw4z2Fw+TbY4aATcm GuKToN2PjHm/brqZV6elpduWtPn6kNUX/CtjABpizaukLLQD0kgZ4QzVmTSoGe20mI lbwtnne/e3Y/k+bX4GciIDPx7iKdBOGyzbitLxGFUnk2indInUV6Xoh0LZ3V8N7BAY jxl6QmQICRZEQ== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=free.fr header.i=@free.fr header.a=rsa-sha256 header.s=smtp-20201208 header.b=ikQS7tP3 Subject: Re: [Buildroot] [PATCH 1/1] package/python3: drop unnecessary patches X-BeenThere: buildroot@buildroot.org 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: James Hilliard , Thomas Petazzoni , Asaf Kahlon , buildroot@buildroot.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Vincent, All, Thanks for tackling this python mess! On 2024-04-27 21:42 -0500, Vincent Fazio spake thusly: > Patches 0004 and 0009 relied upon environment variables that were no > longer set after python3-010-distutils-cross-compilation-support.patch > was dropped during the transition to Python 3.4 in commit 0d327c26. 0004 and 0009 use the _python_sysroot env variable, and it is still set in the environment when we build python packages: $ git grep -n _python_sysroot package/pkg-python.mk:45: _python_sysroot=$(STAGING_DIR) \ It is totally possible that those patches are no longer needed for other reasons, though, but not that one. Regards, Yann E. MORIN. > Patches 0010 and 0026 (see [0] [1] [2]) can be removed due to a fix > introduced in 3.7 [3]. > > Patch 0029 can be dropped since commit 3fed4245 removed the dependency > on a host provided python to build host-python3. > > [0]: https://github.com/python/cpython/issues/67096 > [1]: https://github.com/python/cpython/issues/75894 > [2]: https://github.com/python/cpython/issues/66338 > [3]: https://github.com/python/cpython/commit/14086cfc5eed8c5e78342d79e5db87a135d75fa8 > > Signed-off-by: Vincent Fazio > --- > .checkpackageignore | 51 +++++++------- > ...y-header-paths-for-cross-compilation.patch | 69 ------------------- > ...ok-in-usr-lib-termcap-for-libraries.patch} | 0 > ...h => 0005-Don-t-add-multiarch-paths.patch} | 0 > ...> 0006-Abort-on-failed-module-build.patch} | 0 > ...tch => 0007-Serial-ioctl-workaround.patch} | 0 > ...0008-Add-an-option-to-disable-pydoc.patch} | 0 > ...09-Add-an-option-to-disable-lib2to3.patch} | 0 > ...e-shebang-of-Python-scripts-for-cros.patch | 35 ---------- > ...ption-to-disable-the-sqlite3-module.patch} | 0 > ...ig.sh.in-ensure-sed-invocations-only.patch | 67 ------------------ > ...-an-option-to-disable-the-tk-module.patch} | 0 > ...option-to-disable-the-curses-module.patch} | 0 > ...0013-Add-an-option-to-disable-expat.patch} | 0 > ...Add-an-option-to-disable-CJK-codecs.patch} | 0 > ...> 0015-Add-an-option-to-disable-NIS.patch} | 0 > ...dd-an-option-to-disable-unicodedata.patch} | 0 > ... 0017-Add-an-option-to-disable-IDLE.patch} | 0 > ...18-Add-an-option-to-disable-decimal.patch} | 0 > ...n-to-disable-the-ossaudiodev-module.patch} | 0 > ...n-option-to-disable-openssl-support.patch} | 0 > ...tion-to-disable-the-readline-module.patch} | 0 > ...o-disable-zlib-bzip2-and-xz-modules.patch} | 0 > ...dd-an-option-to-disable-uuid-module.patch} | 0 > ...p-CC-print-multiarch-output-for-mus.patch} | 0 > ...on-to-disable-the-berkeleydb-module.patch} | 0 > ...ng-doesn-t-set-errno-when-encryptio.patch} | 0 > ...thon-config.sh-don-t-reassign-prefix.patch | 53 -------------- > ...ss-compiles-when-host-and-target-us.patch} | 0 > ...-fix-building-on-older-distributions.patch | 47 ------------- > 30 files changed, 23 insertions(+), 299 deletions(-) > delete mode 100644 package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch > rename package/python3/{0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch => 0004-Don-t-look-in-usr-lib-termcap-for-libraries.patch} (100%) > rename package/python3/{0006-Don-t-add-multiarch-paths.patch => 0005-Don-t-add-multiarch-paths.patch} (100%) > rename package/python3/{0007-Abort-on-failed-module-build.patch => 0006-Abort-on-failed-module-build.patch} (100%) > rename package/python3/{0008-Serial-ioctl-workaround.patch => 0007-Serial-ioctl-workaround.patch} (100%) > rename package/python3/{0011-Add-an-option-to-disable-pydoc.patch => 0008-Add-an-option-to-disable-pydoc.patch} (100%) > rename package/python3/{0012-Add-an-option-to-disable-lib2to3.patch => 0009-Add-an-option-to-disable-lib2to3.patch} (100%) > delete mode 100644 package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch > rename package/python3/{0013-Add-option-to-disable-the-sqlite3-module.patch => 0010-Add-option-to-disable-the-sqlite3-module.patch} (100%) > delete mode 100644 package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch > rename package/python3/{0014-Add-an-option-to-disable-the-tk-module.patch => 0011-Add-an-option-to-disable-the-tk-module.patch} (100%) > rename package/python3/{0015-Add-an-option-to-disable-the-curses-module.patch => 0012-Add-an-option-to-disable-the-curses-module.patch} (100%) > rename package/python3/{0016-Add-an-option-to-disable-expat.patch => 0013-Add-an-option-to-disable-expat.patch} (100%) > rename package/python3/{0017-Add-an-option-to-disable-CJK-codecs.patch => 0014-Add-an-option-to-disable-CJK-codecs.patch} (100%) > rename package/python3/{0018-Add-an-option-to-disable-NIS.patch => 0015-Add-an-option-to-disable-NIS.patch} (100%) > rename package/python3/{0019-Add-an-option-to-disable-unicodedata.patch => 0016-Add-an-option-to-disable-unicodedata.patch} (100%) > rename package/python3/{0020-Add-an-option-to-disable-IDLE.patch => 0017-Add-an-option-to-disable-IDLE.patch} (100%) > rename package/python3/{0021-Add-an-option-to-disable-decimal.patch => 0018-Add-an-option-to-disable-decimal.patch} (100%) > rename package/python3/{0022-Add-an-option-to-disable-the-ossaudiodev-module.patch => 0019-Add-an-option-to-disable-the-ossaudiodev-module.patch} (100%) > rename package/python3/{0023-Add-an-option-to-disable-openssl-support.patch => 0020-Add-an-option-to-disable-openssl-support.patch} (100%) > rename package/python3/{0024-Add-an-option-to-disable-the-readline-module.patch => 0021-Add-an-option-to-disable-the-readline-module.patch} (100%) > rename package/python3/{0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch => 0022-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch} (100%) > rename package/python3/{0027-Add-an-option-to-disable-uuid-module.patch => 0023-Add-an-option-to-disable-uuid-module.patch} (100%) > rename package/python3/{0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch => 0024-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch} (100%) > rename package/python3/{0030-Add-an-option-to-disable-the-berkeleydb-module.patch => 0025-Add-an-option-to-disable-the-berkeleydb-module.patch} (100%) > rename package/python3/{0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch => 0026-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch} (100%) > delete mode 100644 package/python3/0026-python-config.sh-don-t-reassign-prefix.patch > rename package/python3/{0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch => 0027-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch} (100%) > delete mode 100644 package/python3/0028-fix-building-on-older-distributions.patch > > diff --git a/.checkpackageignore b/.checkpackageignore > index 1b336ce7a3..eec47fdaa4 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -1045,34 +1045,29 @@ package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch lib_patch.Ups > package/python3/0001-Make-the-build-of-pyc-files-conditional.patch lib_patch.Upstream > package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch lib_patch.Upstream > package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch lib_patch.Upstream > -package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch lib_patch.Upstream > -package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch lib_patch.Upstream > -package/python3/0006-Don-t-add-multiarch-paths.patch lib_patch.Upstream > -package/python3/0007-Abort-on-failed-module-build.patch lib_patch.Upstream > -package/python3/0008-Serial-ioctl-workaround.patch lib_patch.Upstream > -package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch lib_patch.Upstream > -package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch lib_patch.Upstream > -package/python3/0011-Add-an-option-to-disable-pydoc.patch lib_patch.Upstream > -package/python3/0012-Add-an-option-to-disable-lib2to3.patch lib_patch.Upstream > -package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch lib_patch.Upstream > -package/python3/0014-Add-an-option-to-disable-the-tk-module.patch lib_patch.Upstream > -package/python3/0015-Add-an-option-to-disable-the-curses-module.patch lib_patch.Upstream > -package/python3/0016-Add-an-option-to-disable-expat.patch lib_patch.Upstream > -package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch lib_patch.Upstream > -package/python3/0018-Add-an-option-to-disable-NIS.patch lib_patch.Upstream > -package/python3/0019-Add-an-option-to-disable-unicodedata.patch lib_patch.Upstream > -package/python3/0020-Add-an-option-to-disable-IDLE.patch lib_patch.Upstream > -package/python3/0021-Add-an-option-to-disable-decimal.patch lib_patch.Upstream > -package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch lib_patch.Upstream > -package/python3/0023-Add-an-option-to-disable-openssl-support.patch lib_patch.Upstream > -package/python3/0024-Add-an-option-to-disable-the-readline-module.patch lib_patch.Upstream > -package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch lib_patch.Upstream > -package/python3/0026-python-config.sh-don-t-reassign-prefix.patch lib_patch.Upstream > -package/python3/0027-Add-an-option-to-disable-uuid-module.patch lib_patch.Upstream > -package/python3/0028-fix-building-on-older-distributions.patch lib_patch.Upstream > -package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch lib_patch.Upstream > -package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch lib_patch.Upstream > -package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch lib_patch.Upstream > +package/python3/0004-Don-t-look-in-usr-lib-termcap-for-libraries.patch lib_patch.Upstream > +package/python3/0005-Don-t-add-multiarch-paths.patch lib_patch.Upstream > +package/python3/0006-Abort-on-failed-module-build.patch lib_patch.Upstream > +package/python3/0007-Serial-ioctl-workaround.patch lib_patch.Upstream > +package/python3/0008-Add-an-option-to-disable-pydoc.patch lib_patch.Upstream > +package/python3/0009-Add-an-option-to-disable-lib2to3.patch lib_patch.Upstream > +package/python3/0010-Add-option-to-disable-the-sqlite3-module.patch lib_patch.Upstream > +package/python3/0011-Add-an-option-to-disable-the-tk-module.patch lib_patch.Upstream > +package/python3/0012-Add-an-option-to-disable-the-curses-module.patch lib_patch.Upstream > +package/python3/0013-Add-an-option-to-disable-expat.patch lib_patch.Upstream > +package/python3/0014-Add-an-option-to-disable-CJK-codecs.patch lib_patch.Upstream > +package/python3/0015-Add-an-option-to-disable-NIS.patch lib_patch.Upstream > +package/python3/0016-Add-an-option-to-disable-unicodedata.patch lib_patch.Upstream > +package/python3/0017-Add-an-option-to-disable-IDLE.patch lib_patch.Upstream > +package/python3/0018-Add-an-option-to-disable-decimal.patch lib_patch.Upstream > +package/python3/0019-Add-an-option-to-disable-the-ossaudiodev-module.patch lib_patch.Upstream > +package/python3/0020-Add-an-option-to-disable-openssl-support.patch lib_patch.Upstream > +package/python3/0021-Add-an-option-to-disable-the-readline-module.patch lib_patch.Upstream > +package/python3/0022-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch lib_patch.Upstream > +package/python3/0023-Add-an-option-to-disable-uuid-module.patch lib_patch.Upstream > +package/python3/0024-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch lib_patch.Upstream > +package/python3/0025-Add-an-option-to-disable-the-berkeleydb-module.patch lib_patch.Upstream > +package/python3/0026-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch lib_patch.Upstream > package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch lib_patch.Upstream > package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch lib_patch.Upstream > package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch lib_patch.Upstream > diff --git a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch > deleted file mode 100644 > index 9a55d2582d..0000000000 > --- a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch > +++ /dev/null > @@ -1,69 +0,0 @@ > -From 132b9dca3bb4d4682f7e318648ce11e1abb31b62 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni > -Date: Wed, 23 Dec 2015 11:33:14 +0100 > -Subject: [PATCH] Adjust library/header paths for cross-compilation > - > -When cross-compiling third-party extensions, the get_python_inc() or > -get_python_lib() can be called, to return the path to headers or > -libraries. However, they use the sys.prefix of the host Python, which > -returns incorrect paths when cross-compiling (paths pointing to host > -headers and libraries). > - > -In order to fix this, we introduce the _python_sysroot, _python_prefix > -and _python_exec_prefix variables, that allow to override these > -values, and get correct header/library paths when cross-compiling > -third-party Python modules. > - > -Signed-off-by: Thomas Petazzoni > -Signed-off-by: Adam Duskett > -Refresh for 3.10.0 > ---- > - Lib/distutils/command/build_ext.py | 5 ++++- > - Lib/sysconfig.py | 15 +++++++++++---- > - 2 files changed, 15 insertions(+), 5 deletions(-) > - > -diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py > -index f287b34998..298234d6a1 100644 > ---- a/Lib/distutils/command/build_ext.py > -+++ b/Lib/distutils/command/build_ext.py > -@@ -234,7 +234,10 @@ def finalize_options(self): > - if (sysconfig.get_config_var('Py_ENABLE_SHARED')): > - if not sysconfig.python_build: > - # building third party extensions > -- self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) > -+ libdir = sysconfig.get_config_var('LIBDIR') > -+ if "_python_sysroot" in os.environ: > -+ libdir = os.environ.get("_python_sysroot") + libdir > -+ self.library_dirs.append(libdir) > - else: > - # building python standard extensions > - self.library_dirs.append('.') > -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py > -index ebe3711827..6328ec41af 100644 > ---- a/Lib/sysconfig.py > -+++ b/Lib/sysconfig.py > -@@ -168,10 +168,17 @@ def joinuser(*args): > - _PY_VERSION = sys.version.split()[0] > - _PY_VERSION_SHORT = f'{sys.version_info[0]}.{sys.version_info[1]}' > - _PY_VERSION_SHORT_NO_DOT = f'{sys.version_info[0]}{sys.version_info[1]}' > --_PREFIX = os.path.normpath(sys.prefix) > --_BASE_PREFIX = os.path.normpath(sys.base_prefix) > --_EXEC_PREFIX = os.path.normpath(sys.exec_prefix) > --_BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) > -+if "_python_sysroot" in os.environ: > -+ _sysroot=os.environ.get('_python_sysroot') > -+ _PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix')) > -+ _EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix')) > -+ _BASE_PREFIX = _PREFIX > -+ _BASE_EXEC_PREFIX = _EXEC_PREFIX > -+else: > -+ _PREFIX = os.path.normpath(sys.prefix) > -+ _EXEC_PREFIX = os.path.normpath(sys.exec_prefix) > -+ _BASE_PREFIX = os.path.normpath(sys.base_prefix) > -+ _BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) > - _CONFIG_VARS = None > - _USER_BASE = None > - > --- > -2.34.1 > - > diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0004-Don-t-look-in-usr-lib-termcap-for-libraries.patch > similarity index 100% > rename from package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch > rename to package/python3/0004-Don-t-look-in-usr-lib-termcap-for-libraries.patch > diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0005-Don-t-add-multiarch-paths.patch > similarity index 100% > rename from package/python3/0006-Don-t-add-multiarch-paths.patch > rename to package/python3/0005-Don-t-add-multiarch-paths.patch > diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0006-Abort-on-failed-module-build.patch > similarity index 100% > rename from package/python3/0007-Abort-on-failed-module-build.patch > rename to package/python3/0006-Abort-on-failed-module-build.patch > diff --git a/package/python3/0008-Serial-ioctl-workaround.patch b/package/python3/0007-Serial-ioctl-workaround.patch > similarity index 100% > rename from package/python3/0008-Serial-ioctl-workaround.patch > rename to package/python3/0007-Serial-ioctl-workaround.patch > diff --git a/package/python3/0011-Add-an-option-to-disable-pydoc.patch b/package/python3/0008-Add-an-option-to-disable-pydoc.patch > similarity index 100% > rename from package/python3/0011-Add-an-option-to-disable-pydoc.patch > rename to package/python3/0008-Add-an-option-to-disable-pydoc.patch > diff --git a/package/python3/0012-Add-an-option-to-disable-lib2to3.patch b/package/python3/0009-Add-an-option-to-disable-lib2to3.patch > similarity index 100% > rename from package/python3/0012-Add-an-option-to-disable-lib2to3.patch > rename to package/python3/0009-Add-an-option-to-disable-lib2to3.patch > diff --git a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch > deleted file mode 100644 > index eff8fc7694..0000000000 > --- a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 2439bd2ed5dbdd7e5fda15adefd0f6f1b047ec1b Mon Sep 17 00:00:00 2001 > -From: Christophe Vu-Brugier > -Date: Wed, 23 Dec 2015 11:44:30 +0100 > -Subject: [PATCH] Do not adjust the shebang of Python scripts for > - cross-compilation > - > -The copy_scripts() method in distutils copies the scripts listed in > -the setup file and adjusts the first line to refer to the current > -Python interpreter. When cross-compiling, this means that the adjusted > -shebang refers to the host Python interpreter. > - > -This patch modifies copy_scripts() to preserve the shebang when > -cross-compilation is detected. > - > -Signed-off-by: Christophe Vu-Brugier > ---- > - Lib/distutils/command/build_scripts.py | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py > -index ccc70e6465..d6d54195c1 100644 > ---- a/Lib/distutils/command/build_scripts.py > -+++ b/Lib/distutils/command/build_scripts.py > -@@ -91,7 +91,7 @@ def copy_scripts(self): > - adjust = True > - post_interp = match.group(1) or b'' > - > -- if adjust: > -+ if adjust and not '_python_sysroot' in os.environ: > - log.info("copying and adjusting %s -> %s", script, > - self.build_dir) > - updated_files.append(outfile) > --- > -2.34.1 > - > diff --git a/package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0010-Add-option-to-disable-the-sqlite3-module.patch > similarity index 100% > rename from package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch > rename to package/python3/0010-Add-option-to-disable-the-sqlite3-module.patch > diff --git a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch > deleted file mode 100644 > index f26ee85b61..0000000000 > --- a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch > +++ /dev/null > @@ -1,67 +0,0 @@ > -From 55ef5552e4ee60266e3299f253bec3b13785e585 Mon Sep 17 00:00:00 2001 > -From: Peter Korsgaard > -Date: Thu, 20 Nov 2014 13:24:59 +0100 > -Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match > - beginning of strings > - > -The build/real prefix handling using sed breaks if build != real and the > -standard include / lib directories are used ($prefix/include and $prefix/lib). > - > -E.G. > - > -prefix_build="/usr", libdir="$prefix/lib", includedir="$prefix/include". > - > -If this gets installed with make DESTDIR="/foo" install, then we end up with > -prefix_real = prefix = "/foo/usr" as expected, but > -includedir="/foo/foo/usr/include" and libdir="/foo/foo/usr/lib" because of > -the double sed invocation (prefix is already expanded). Work around it by > -ensuring we only match the beginning of the string. > - > -Submitted upstream: http://bugs.python.org/issue22907 > - > -Signed-off-by: Peter Korsgaard > ---- > - Misc/python-config.sh.in | 13 +++++++------ > - 1 file changed, 7 insertions(+), 6 deletions(-) > - > -diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in > -index 2602fe24c0..a1bc3cd5f7 100644 > ---- a/Misc/python-config.sh.in > -+++ b/Misc/python-config.sh.in > -@@ -24,18 +24,19 @@ installed_prefix () > - echo $RESULT > - } > - > -+prefix_build="@prefix@" > - prefix_real=$(installed_prefix "$0") > - > - # Use sed to fix paths from their built-to locations to their installed-to > - # locations. Keep prefix & exec_prefix using their original values in case > - # they are referenced in other configure variables, to prevent double > - # substitution, issue #22140. > --prefix="@prefix@" > --exec_prefix="@exec_prefix@" > -+prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#") > -+exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#") > - exec_prefix_real=${prefix_real} > --includedir=$(echo "@includedir@" | sed "s#$prefix#$prefix_real#") > --libdir=$(echo "@libdir@" | sed "s#$prefix#$prefix_real#") > --CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix#$prefix_real#") > -+includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#") > -+libdir=$(echo "@libdir@" | sed "s#^$prefix_build#$prefix_real#") > -+CFLAGS=$(echo "@CFLAGS@" | sed "s#^$prefix_build#$prefix_real#") > - VERSION="@VERSION@" > - LIBM="@LIBM@" > - LIBC="@LIBC@" > -@@ -49,7 +50,7 @@ OPT="@OPT@" > - PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" > - LDVERSION="@LDVERSION@" > - LIBDEST=${prefix_real}/lib/python${VERSION} > --LIBPL=$(echo "@LIBPL@" | sed "s#$prefix#$prefix_real#") > -+LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#") > - SO="@EXT_SUFFIX@" > - PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" > - INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" > --- > -2.34.1 > - > diff --git a/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0011-Add-an-option-to-disable-the-tk-module.patch > similarity index 100% > rename from package/python3/0014-Add-an-option-to-disable-the-tk-module.patch > rename to package/python3/0011-Add-an-option-to-disable-the-tk-module.patch > diff --git a/package/python3/0015-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0012-Add-an-option-to-disable-the-curses-module.patch > similarity index 100% > rename from package/python3/0015-Add-an-option-to-disable-the-curses-module.patch > rename to package/python3/0012-Add-an-option-to-disable-the-curses-module.patch > diff --git a/package/python3/0016-Add-an-option-to-disable-expat.patch b/package/python3/0013-Add-an-option-to-disable-expat.patch > similarity index 100% > rename from package/python3/0016-Add-an-option-to-disable-expat.patch > rename to package/python3/0013-Add-an-option-to-disable-expat.patch > diff --git a/package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0014-Add-an-option-to-disable-CJK-codecs.patch > similarity index 100% > rename from package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch > rename to package/python3/0014-Add-an-option-to-disable-CJK-codecs.patch > diff --git a/package/python3/0018-Add-an-option-to-disable-NIS.patch b/package/python3/0015-Add-an-option-to-disable-NIS.patch > similarity index 100% > rename from package/python3/0018-Add-an-option-to-disable-NIS.patch > rename to package/python3/0015-Add-an-option-to-disable-NIS.patch > diff --git a/package/python3/0019-Add-an-option-to-disable-unicodedata.patch b/package/python3/0016-Add-an-option-to-disable-unicodedata.patch > similarity index 100% > rename from package/python3/0019-Add-an-option-to-disable-unicodedata.patch > rename to package/python3/0016-Add-an-option-to-disable-unicodedata.patch > diff --git a/package/python3/0020-Add-an-option-to-disable-IDLE.patch b/package/python3/0017-Add-an-option-to-disable-IDLE.patch > similarity index 100% > rename from package/python3/0020-Add-an-option-to-disable-IDLE.patch > rename to package/python3/0017-Add-an-option-to-disable-IDLE.patch > diff --git a/package/python3/0021-Add-an-option-to-disable-decimal.patch b/package/python3/0018-Add-an-option-to-disable-decimal.patch > similarity index 100% > rename from package/python3/0021-Add-an-option-to-disable-decimal.patch > rename to package/python3/0018-Add-an-option-to-disable-decimal.patch > diff --git a/package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0019-Add-an-option-to-disable-the-ossaudiodev-module.patch > similarity index 100% > rename from package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch > rename to package/python3/0019-Add-an-option-to-disable-the-ossaudiodev-module.patch > diff --git a/package/python3/0023-Add-an-option-to-disable-openssl-support.patch b/package/python3/0020-Add-an-option-to-disable-openssl-support.patch > similarity index 100% > rename from package/python3/0023-Add-an-option-to-disable-openssl-support.patch > rename to package/python3/0020-Add-an-option-to-disable-openssl-support.patch > diff --git a/package/python3/0024-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0021-Add-an-option-to-disable-the-readline-module.patch > similarity index 100% > rename from package/python3/0024-Add-an-option-to-disable-the-readline-module.patch > rename to package/python3/0021-Add-an-option-to-disable-the-readline-module.patch > diff --git a/package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0022-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch > similarity index 100% > rename from package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch > rename to package/python3/0022-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch > diff --git a/package/python3/0027-Add-an-option-to-disable-uuid-module.patch b/package/python3/0023-Add-an-option-to-disable-uuid-module.patch > similarity index 100% > rename from package/python3/0027-Add-an-option-to-disable-uuid-module.patch > rename to package/python3/0023-Add-an-option-to-disable-uuid-module.patch > diff --git a/package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0024-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch > similarity index 100% > rename from package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch > rename to package/python3/0024-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch > diff --git a/package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch b/package/python3/0025-Add-an-option-to-disable-the-berkeleydb-module.patch > similarity index 100% > rename from package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch > rename to package/python3/0025-Add-an-option-to-disable-the-berkeleydb-module.patch > diff --git a/package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/0026-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch > similarity index 100% > rename from package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch > rename to package/python3/0026-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch > diff --git a/package/python3/0026-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0026-python-config.sh-don-t-reassign-prefix.patch > deleted file mode 100644 > index b6bfb010a0..0000000000 > --- a/package/python3/0026-python-config.sh-don-t-reassign-prefix.patch > +++ /dev/null > @@ -1,53 +0,0 @@ > -From 755fb526a62df2a73560f42184db8aadb6899bb0 Mon Sep 17 00:00:00 2001 > -From: Matt Weber > -Date: Fri, 6 Oct 2017 09:54:15 -0500 > -Subject: [PATCH] python-config.sh: don't reassign ${prefix} > - > -When prefix is set to a path like /usr during crossbuild > -the sed operations end up executing twice, once for the prefix > -reassignment and another for includedir if it is set as a string > -including the ${prefix} variable. This results in an issue > -when the build directory is under /usr. > - > -This patch updates the remaining location which uses the prefix > -variable to also sed and update to use the real path. > - > -Upstream bug report: > -https://bugs.python.org/issue31713 > - > -Buildroot bug: > -https://bugs.busybox.net/show_bug.cgi?id=10361 > - > -Fixes failures like the following: > -dbus-python-1.2.4 | NOK | http://autobuild.buildroot.net/results/758858efa97b6273c1b470513f5492258a6d8853 > - > -Signed-off-by: Matthew Weber > ---- > - Misc/python-config.sh.in | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in > -index a1bc3cd5f7..164d2d3603 100644 > ---- a/Misc/python-config.sh.in > -+++ b/Misc/python-config.sh.in > -@@ -31,7 +31,7 @@ prefix_real=$(installed_prefix "$0") > - # locations. Keep prefix & exec_prefix using their original values in case > - # they are referenced in other configure variables, to prevent double > - # substitution, issue #22140. > --prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#") > -+prefix=$prefix_build > - exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#") > - exec_prefix_real=${prefix_real} > - includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#") > -@@ -49,7 +49,7 @@ LDLIBRARY="@LDLIBRARY@" > - OPT="@OPT@" > - PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" > - LDVERSION="@LDVERSION@" > --LIBDEST=${prefix_real}/lib/python${VERSION} > -+LIBDEST=$( echo "${prefix}/lib/python${VERSION}" | sed "s#^$prefix_build#$prefix_real#") > - LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#") > - SO="@EXT_SUFFIX@" > - PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" > --- > -2.34.1 > - > diff --git a/package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch b/package/python3/0027-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch > similarity index 100% > rename from package/python3/0032-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch > rename to package/python3/0027-gh-115382-Fix-cross-compiles-when-host-and-target-us.patch > diff --git a/package/python3/0028-fix-building-on-older-distributions.patch b/package/python3/0028-fix-building-on-older-distributions.patch > deleted file mode 100644 > index 4541b31c5f..0000000000 > --- a/package/python3/0028-fix-building-on-older-distributions.patch > +++ /dev/null > @@ -1,47 +0,0 @@ > -From e52e2c5e3df4bc3d2ff07ecb3b8e2a9099ea1631 Mon Sep 17 00:00:00 2001 > -From: Adam Duskett > -Date: Thu, 16 Aug 2018 14:52:37 -0700 > -Subject: [PATCH] fix building on older distributions > - > -Python > 3.6.3 calls os.replace in the update_file.py script, during the > -regen-importlib phase of the build process. > - > -According to Doc/whatsnew/3.3.rst line 1631, os.replace acts in the same > -way as os.rename, however, it is now cross-platform compatible for Windows. > - > -Because BuildRoot is guaranteed only to be built in POSIX environment, it is > -safe to change os.replace back to os.rename. > - > -This change fixes building on older systems such as CentOS7, that only come > -with python 2. > - > -Signed-off-by: Adam Duskett > ---- > - Tools/scripts/update_file.py | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/Tools/scripts/update_file.py b/Tools/scripts/update_file.py > -index b4182c1d0c..ab443cb1a6 100644 > ---- a/Tools/scripts/update_file.py > -+++ b/Tools/scripts/update_file.py > -@@ -53,7 +53,7 @@ def update_file_with_tmpfile(filename, tmpfile, *, create=False): > - if not create: > - raise # re-raise > - outcome = 'created' > -- os.replace(tmpfile, filename) > -+ os.rename(tmpfile, filename) > - else: > - with targetfile: > - old_contents = targetfile.read() > -@@ -62,7 +62,7 @@ def update_file_with_tmpfile(filename, tmpfile, *, create=False): > - # Now compare! > - if old_contents != new_contents: > - outcome = 'updated' > -- os.replace(tmpfile, filename) > -+ os.rename(tmpfile, filename) > - else: > - outcome = 'same' > - os.unlink(tmpfile) > --- > -2.34.1 > - > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot