* [Buildroot] [PATCH v2 00/11] package/python3: bump to version 3.10 @ 2021-10-14 22:58 Adam Duskett 2021-10-14 22:58 ` [Buildroot] [PATCH v2 01/11] package/util-linux: bump to version 2.37.2 Adam Duskett ` (10 more replies) 0 siblings, 11 replies; 22+ messages in thread From: Adam Duskett @ 2021-10-14 22:58 UTC (permalink / raw) To: buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt, Adam Duskett In the following patch series python3 (eventually) gets bumped to version 3.10 - The first parts involve updating packages that are not compatible with 3.10. Either by updating versions or adding patches. - Then I complain about python-setuptools and split add support for both setuptools 48 (compatible with python2) and 58 (compatible with python3.10) - Finally I update python3 to 3.10 This patch series has been tested against every python2 and python3 unit-test available in buildroot, including against https://patchwork.ozlabs.org/project/buildroot/patch/20211006203823.2740442-1-yann.morin.1998@free.fr/ In addition, I also selected *EVERY* python module to ensure all of them at least build against python3.10, and everything passes. Finally, I ran a test-pkg -a on python3.10 to ensure that this didn't break any other platforms. Changes v1 -> v2: - Drop the new dataclasses package as it isn't necessary for python >= 3.6 Adam Duskett (11): package/util-linux: bump to version 2.37.2 package/python-pydantic: bump to version 1.8.2 package/python-txtorcon: bump to version 21.1.0 package/python-watchdog: bump to version 2.1.6 package/python-certifi: add host variant package/python-matplotlib: bump to version 3.4.3 package/python-numpy: bump to version 1.21.2 package/python-pyalsa: add 0001-fix-pytuple-set-item-usage-no-return-value.patch package/python-django-enumfields: bump to version 2.1.1 package/python-setuptools: bump to version 58.2.0 and split python2 version package/python3: bump to version 3.10 package/python-certifi/python-certifi.mk | 1 + .../python-django-enumfields.hash | 6 +- .../python-django-enumfields.mk | 4 +- .../0001-Fix-invalid-inclusion-headers.patch | 29 --- ...st-11983-from-anntzer-builddepchecks.patch | 170 ------------------ package/python-matplotlib/Config.in | 2 + .../python-matplotlib/python-matplotlib.hash | 2 +- .../python-matplotlib/python-matplotlib.mk | 14 +- package/python-matplotlib/setup.cfg | 10 ++ package/python-numpy/python-numpy.hash | 11 +- package/python-numpy/python-numpy.mk | 16 +- ...tuple-set-item-usage-no-return-value.patch | 48 +++++ package/python-pydantic/Config.in | 1 + package/python-pydantic/python-pydantic.hash | 6 +- package/python-pydantic/python-pydantic.mk | 4 +- .../{ => 44.0.0}/0001-add-executable.patch | 0 .../{ => 44.0.0}/python-setuptools.hash | 0 .../58.2.0/0001-add-executable.patch | 72 ++++++++ .../58.2.0/python-setuptools.hash | 4 + .../python-setuptools/python-setuptools.mk | 13 +- package/python-txtorcon/python-txtorcon.hash | 4 +- package/python-txtorcon/python-txtorcon.mk | 4 +- package/python-watchdog/python-watchdog.hash | 11 +- package/python-watchdog/python-watchdog.mk | 4 +- .../0001-add-executable.patch | 2 +- .../python3-setuptools.hash | 2 +- .../python3-setuptools/python3-setuptools.mk | 14 +- ...e-the-build-of-pyc-files-conditional.patch | 6 +- ...taddrinfo-configure-test-when-cross-.patch | 2 +- ...re-to-disable-the-build-of-certain-e.patch | 16 +- ...y-header-paths-for-cross-compilation.patch | 52 +++--- ...ook-in-usr-lib-termcap-for-libraries.patch | 4 +- .../0006-Don-t-add-multiarch-paths.patch | 2 +- .../0007-Abort-on-failed-module-build.patch | 2 +- ...locale-and-set-to-default-when-addin.patch | 2 +- ...Add-importlib-fix-for-PEP-3147-issue.patch | 6 +- ...-disable-installation-of-test-module.patch | 117 ------------ ...0013-Add-an-option-to-disable-pydoc.patch} | 49 ++--- ...14-Add-an-option-to-disable-lib2to3.patch} | 83 ++++----- ...ption-to-disable-the-sqlite3-module.patch} | 46 ++--- ...-an-option-to-disable-the-tk-module.patch} | 61 +++---- ...option-to-disable-the-curses-module.patch} | 37 ++-- ...0018-Add-an-option-to-disable-expat.patch} | 43 ++--- ...Add-an-option-to-disable-CJK-codecs.patch} | 2 +- ...> 0020-Add-an-option-to-disable-NIS.patch} | 2 +- ...dd-an-option-to-disable-unicodedata.patch} | 2 +- ... 0022-Add-an-option-to-disable-IDLE.patch} | 51 +++--- ...23-Add-an-option-to-disable-decimal.patch} | 6 +- ...n-to-disable-the-ossaudiodev-module.patch} | 2 +- ...n-option-to-disable-openssl-support.patch} | 6 +- ...tion-to-disable-the-readline-module.patch} | 6 +- ...o-disable-zlib-bzip2-and-xz-modules.patch} | 6 +- ...hon-config.sh-don-t-reassign-prefix.patch} | 4 +- ...Fix-cross-compiling-the-uuid-module.patch} | 2 +- ...dd-an-option-to-disable-uuid-module.patch} | 6 +- ...fix-building-on-older-distributions.patch} | 0 ...p-CC-print-multiarch-output-for-mus.patch} | 2 +- ...on-to-disable-the-berkeleydb-module.patch} | 6 +- ...ng-doesn-t-set-errno-when-encryptio.patch} | 0 ...eration-error-in-_ExecutorManagerTh.patch} | 0 package/python3/python3.hash | 8 +- package/python3/python3.mk | 4 +- package/util-linux/util-linux.hash | 4 +- package/util-linux/util-linux.mk | 2 +- 64 files changed, 474 insertions(+), 629 deletions(-) delete mode 100644 package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch delete mode 100644 package/python-matplotlib/0002-Merge-pull-request-11983-from-anntzer-builddepchecks.patch create mode 100644 package/python-matplotlib/setup.cfg create mode 100644 package/python-pyalsa/0001-fix-pytuple-set-item-usage-no-return-value.patch rename package/python-setuptools/{ => 44.0.0}/0001-add-executable.patch (100%) rename package/python-setuptools/{ => 44.0.0}/python-setuptools.hash (100%) create mode 100644 package/python-setuptools/58.2.0/0001-add-executable.patch create mode 100644 package/python-setuptools/58.2.0/python-setuptools.hash delete mode 100644 package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch rename package/python3/{0014-Add-an-option-to-disable-pydoc.patch => 0013-Add-an-option-to-disable-pydoc.patch} (74%) rename package/python3/{0015-Add-an-option-to-disable-lib2to3.patch => 0014-Add-an-option-to-disable-lib2to3.patch} (67%) rename package/python3/{0016-Add-option-to-disable-the-sqlite3-module.patch => 0015-Add-option-to-disable-the-sqlite3-module.patch} (63%) rename package/python3/{0017-Add-an-option-to-disable-the-tk-module.patch => 0016-Add-an-option-to-disable-the-tk-module.patch} (52%) rename package/python3/{0018-Add-an-option-to-disable-the-curses-module.patch => 0017-Add-an-option-to-disable-the-curses-module.patch} (64%) rename package/python3/{0019-Add-an-option-to-disable-expat.patch => 0018-Add-an-option-to-disable-expat.patch} (76%) rename package/python3/{0020-Add-an-option-to-disable-CJK-codecs.patch => 0019-Add-an-option-to-disable-CJK-codecs.patch} (94%) rename package/python3/{0021-Add-an-option-to-disable-NIS.patch => 0020-Add-an-option-to-disable-NIS.patch} (95%) rename package/python3/{0022-Add-an-option-to-disable-unicodedata.patch => 0021-Add-an-option-to-disable-unicodedata.patch} (95%) rename package/python3/{0023-Add-an-option-to-disable-IDLE.patch => 0022-Add-an-option-to-disable-IDLE.patch} (69%) rename package/python3/{0024-Add-an-option-to-disable-decimal.patch => 0023-Add-an-option-to-disable-decimal.patch} (95%) rename package/python3/{0025-Add-an-option-to-disable-the-ossaudiodev-module.patch => 0024-Add-an-option-to-disable-the-ossaudiodev-module.patch} (97%) rename package/python3/{0026-Add-an-option-to-disable-openssl-support.patch => 0025-Add-an-option-to-disable-openssl-support.patch} (89%) rename package/python3/{0027-Add-an-option-to-disable-the-readline-module.patch => 0026-Add-an-option-to-disable-the-readline-module.patch} (90%) rename package/python3/{0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch => 0027-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch} (92%) rename package/python3/{0029-python-config.sh-don-t-reassign-prefix.patch => 0028-python-config.sh-don-t-reassign-prefix.patch} (97%) rename package/python3/{0030-Fix-cross-compiling-the-uuid-module.patch => 0029-Fix-cross-compiling-the-uuid-module.patch} (96%) rename package/python3/{0031-Add-an-option-to-disable-uuid-module.patch => 0030-Add-an-option-to-disable-uuid-module.patch} (88%) rename package/python3/{0032-fix-building-on-older-distributions.patch => 0031-fix-building-on-older-distributions.patch} (100%) rename package/python3/{0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch => 0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch} (98%) rename package/python3/{0034-Add-an-option-to-disable-the-berkeleydb-module.patch => 0033-Add-an-option-to-disable-the-berkeleydb-module.patch} (88%) rename package/python3/{0035-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch => 0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch} (100%) rename package/python3/{0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch => 0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch} (100%) -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v2 01/11] package/util-linux: bump to version 2.37.2 2021-10-14 22:58 [Buildroot] [PATCH v2 00/11] package/python3: bump to version 3.10 Adam Duskett @ 2021-10-14 22:58 ` Adam Duskett 2021-10-16 16:51 ` Yann E. MORIN 2021-10-14 22:58 ` [Buildroot] [PATCH v2 02/11] package/python-pydantic: bump to version 1.8.2 Adam Duskett ` (9 subsequent siblings) 10 siblings, 1 reply; 22+ messages in thread From: Adam Duskett @ 2021-10-14 22:58 UTC (permalink / raw) To: buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt, Adam Duskett Signed-off-by: Adam Duskett <aduskett@gmail.com> --- package/util-linux/util-linux.hash | 4 ++-- package/util-linux/util-linux.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 3f9fe39818..eafbe9254a 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ -# From https://www.kernel.org/pub/linux/utils/util-linux/v2.36/sha256sums.asc -sha256 f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f util-linux-2.36.2.tar.xz +# From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc +sha256 6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 util-linux-2.37.2.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 4bc7a11294..cf0fee409b 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -7,7 +7,7 @@ # When making changes to this file, please check if # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. -UTIL_LINUX_VERSION_MAJOR = 2.36 +UTIL_LINUX_VERSION_MAJOR = 2.37 UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v2 01/11] package/util-linux: bump to version 2.37.2 2021-10-14 22:58 ` [Buildroot] [PATCH v2 01/11] package/util-linux: bump to version 2.37.2 Adam Duskett @ 2021-10-16 16:51 ` Yann E. MORIN 0 siblings, 0 replies; 22+ messages in thread From: Yann E. MORIN @ 2021-10-16 16:51 UTC (permalink / raw) To: Adam Duskett Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, buildroot, Oli Vogt Adam, All, On 2021-10-14 15:58 -0700, Adam Duskett spake thusly: > Signed-off-by: Adam Duskett <aduskett@gmail.com> This fixes CVE-2021-37600, so I've added that to the commit log, and applied to master, thanks. Regards, Yann E. MORIN. > --- > package/util-linux/util-linux.hash | 4 ++-- > package/util-linux/util-linux.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash > index 3f9fe39818..eafbe9254a 100644 > --- a/package/util-linux/util-linux.hash > +++ b/package/util-linux/util-linux.hash > @@ -1,5 +1,5 @@ > -# From https://www.kernel.org/pub/linux/utils/util-linux/v2.36/sha256sums.asc > -sha256 f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f util-linux-2.36.2.tar.xz > +# From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc > +sha256 6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9 util-linux-2.37.2.tar.xz > # License files, locally calculated > sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing > sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index 4bc7a11294..cf0fee409b 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -7,7 +7,7 @@ > # When making changes to this file, please check if > # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. > > -UTIL_LINUX_VERSION_MAJOR = 2.36 > +UTIL_LINUX_VERSION_MAJOR = 2.37 > UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 > UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz > UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) > -- > 2.30.2 > > _______________________________________________ > 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 ^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v2 02/11] package/python-pydantic: bump to version 1.8.2 2021-10-14 22:58 [Buildroot] [PATCH v2 00/11] package/python3: bump to version 3.10 Adam Duskett 2021-10-14 22:58 ` [Buildroot] [PATCH v2 01/11] package/util-linux: bump to version 2.37.2 Adam Duskett @ 2021-10-14 22:58 ` Adam Duskett 2021-10-25 19:13 ` Arnout Vandecappelle 2021-10-14 22:58 ` [Buildroot] [PATCH v2 03/11] package/python-txtorcon: bump to version 21.1.0 Adam Duskett ` (8 subsequent siblings) 10 siblings, 1 reply; 22+ messages in thread From: Adam Duskett @ 2021-10-14 22:58 UTC (permalink / raw) To: buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt, Adam Duskett Signed-off-by: Adam Duskett <aduskett@gmail.com> --- package/python-pydantic/Config.in | 1 + package/python-pydantic/python-pydantic.hash | 6 +++--- package/python-pydantic/python-pydantic.mk | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-pydantic/Config.in b/package/python-pydantic/Config.in index 07b506a20f..ac81aeb342 100644 --- a/package/python-pydantic/Config.in +++ b/package/python-pydantic/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_PYDANTIC bool "python-pydantic" depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Data validation and settings management using python 3.6 type hinting. diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index 7bb076fe2f..215b5d1714 100644 --- a/package/python-pydantic/python-pydantic.hash +++ b/package/python-pydantic/python-pydantic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic/json -md5 ce0c1824d1797bc7d67953428c4fe965 pydantic-1.3.tar.gz -sha256 2eab7d548b0e530bf65bee7855ad8164c2f6a889975d5e9c4eefd1e7c98245dc pydantic-1.3.tar.gz +md5 7845d2f3c8fe8602f73f53ec5b6dfa29 pydantic-1.8.2.tar.gz +sha256 26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b pydantic-1.8.2.tar.gz # Locally computed sha256 checksums -sha256 66badbfe56618ec52ddcbfda62450e43752d16fe1e7cae78d346c7ed10a35306 LICENSE +sha256 9e3946690ac88b6b73e8f001a0586af13568be8852fd514e4393f39761764387 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index 0f9dd66a6f..b282241506 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 1.3 +PYTHON_PYDANTIC_VERSION = 1.8.2 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/3e/69/b22c0eb3157115e1e3d111f574a6a41552539f1e53b064121ef4e9ac1368 +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/b9/d2/12a808613937a6b98cd50d6467352f01322dc0d8ca9fb5b94441625d6684 PYTHON_PYDANTIC_SETUP_TYPE = setuptools PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v2 02/11] package/python-pydantic: bump to version 1.8.2 2021-10-14 22:58 ` [Buildroot] [PATCH v2 02/11] package/python-pydantic: bump to version 1.8.2 Adam Duskett @ 2021-10-25 19:13 ` Arnout Vandecappelle 0 siblings, 0 replies; 22+ messages in thread From: Arnout Vandecappelle @ 2021-10-25 19:13 UTC (permalink / raw) To: Adam Duskett, buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt On 15/10/2021 00:58, Adam Duskett wrote: > Signed-off-by: Adam Duskett <aduskett@gmail.com> > --- > package/python-pydantic/Config.in | 1 + > package/python-pydantic/python-pydantic.hash | 6 +++--- > package/python-pydantic/python-pydantic.mk | 4 ++-- > 3 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/package/python-pydantic/Config.in b/package/python-pydantic/Config.in > index 07b506a20f..ac81aeb342 100644 > --- a/package/python-pydantic/Config.in > +++ b/package/python-pydantic/Config.in > @@ -1,6 +1,7 @@ > config BR2_PACKAGE_PYTHON_PYDANTIC > bool "python-pydantic" > depends on BR2_PACKAGE_PYTHON3 > + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime > help > Data validation and settings management using python 3.6 > type hinting. > diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash > index 7bb076fe2f..215b5d1714 100644 > --- a/package/python-pydantic/python-pydantic.hash > +++ b/package/python-pydantic/python-pydantic.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pydantic/json > -md5 ce0c1824d1797bc7d67953428c4fe965 pydantic-1.3.tar.gz > -sha256 2eab7d548b0e530bf65bee7855ad8164c2f6a889975d5e9c4eefd1e7c98245dc pydantic-1.3.tar.gz > +md5 7845d2f3c8fe8602f73f53ec5b6dfa29 pydantic-1.8.2.tar.gz > +sha256 26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b pydantic-1.8.2.tar.gz > # Locally computed sha256 checksums > -sha256 66badbfe56618ec52ddcbfda62450e43752d16fe1e7cae78d346c7ed10a35306 LICENSE > +sha256 9e3946690ac88b6b73e8f001a0586af13568be8852fd514e4393f39761764387 LICENSE If the license hash has changed, you have to explain what changed in the commit message. In this case, it's a copyright year update. Applied to master, thanks. Regards, Arnout > diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk > index 0f9dd66a6f..b282241506 100644 > --- a/package/python-pydantic/python-pydantic.mk > +++ b/package/python-pydantic/python-pydantic.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYDANTIC_VERSION = 1.3 > +PYTHON_PYDANTIC_VERSION = 1.8.2 > PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz > -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/3e/69/b22c0eb3157115e1e3d111f574a6a41552539f1e53b064121ef4e9ac1368 > +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/b9/d2/12a808613937a6b98cd50d6467352f01322dc0d8ca9fb5b94441625d6684 > PYTHON_PYDANTIC_SETUP_TYPE = setuptools > PYTHON_PYDANTIC_LICENSE = MIT > PYTHON_PYDANTIC_LICENSE_FILES = LICENSE > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v2 03/11] package/python-txtorcon: bump to version 21.1.0 2021-10-14 22:58 [Buildroot] [PATCH v2 00/11] package/python3: bump to version 3.10 Adam Duskett 2021-10-14 22:58 ` [Buildroot] [PATCH v2 01/11] package/util-linux: bump to version 2.37.2 Adam Duskett 2021-10-14 22:58 ` [Buildroot] [PATCH v2 02/11] package/python-pydantic: bump to version 1.8.2 Adam Duskett @ 2021-10-14 22:58 ` Adam Duskett 2021-10-25 19:21 ` Arnout Vandecappelle 2021-10-14 22:58 ` [Buildroot] [PATCH v2 04/11] package/python-watchdog: bump to version 2.1.6 Adam Duskett ` (7 subsequent siblings) 10 siblings, 1 reply; 22+ messages in thread From: Adam Duskett @ 2021-10-14 22:58 UTC (permalink / raw) To: buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt, Adam Duskett Signed-off-by: Adam Duskett <aduskett@gmail.com> --- package/python-txtorcon/python-txtorcon.hash | 4 ++-- package/python-txtorcon/python-txtorcon.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-txtorcon/python-txtorcon.hash b/package/python-txtorcon/python-txtorcon.hash index 803933f1e6..af542c7f2e 100644 --- a/package/python-txtorcon/python-txtorcon.hash +++ b/package/python-txtorcon/python-txtorcon.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/txtorcon/json -md5 fb323f9874298a8145dbe8d43c387932 txtorcon-19.1.0.tar.gz -sha256 25d8e52c3eac45bb90ff958ca7cdd7674fb3284e3a50826a58ab7b9578b15ea5 txtorcon-19.1.0.tar.gz +md5 dbb53821a3ce3e921e09c5de4f722fdb txtorcon-21.1.0.tar.gz +sha256 aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6 txtorcon-21.1.0.tar.gz # Locally computed sha256 checksums sha256 3ada1c32ef38c23d96d7f4e8f4a226c527f51e0202883c7543b06f9cc5228a2b LICENSE diff --git a/package/python-txtorcon/python-txtorcon.mk b/package/python-txtorcon/python-txtorcon.mk index 4df400c3e7..b8414d96d0 100644 --- a/package/python-txtorcon/python-txtorcon.mk +++ b/package/python-txtorcon/python-txtorcon.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXTORCON_VERSION = 19.1.0 +PYTHON_TXTORCON_VERSION = 21.1.0 PYTHON_TXTORCON_SOURCE = txtorcon-$(PYTHON_TXTORCON_VERSION).tar.gz -PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/8c/26/d5b2fba4ffbcb23957ff2cee4d7d0a2d667372b9eb04807058bd561c8e8f +PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/eb/43/2426009377cef519c53bdc8969590cb100e9fd745846859963c881c6d176 PYTHON_TXTORCON_SETUP_TYPE = setuptools PYTHON_TXTORCON_LICENSE = MIT PYTHON_TXTORCON_LICENSE_FILES = LICENSE -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v2 03/11] package/python-txtorcon: bump to version 21.1.0 2021-10-14 22:58 ` [Buildroot] [PATCH v2 03/11] package/python-txtorcon: bump to version 21.1.0 Adam Duskett @ 2021-10-25 19:21 ` Arnout Vandecappelle 0 siblings, 0 replies; 22+ messages in thread From: Arnout Vandecappelle @ 2021-10-25 19:21 UTC (permalink / raw) To: Adam Duskett, buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt On 15/10/2021 00:58, Adam Duskett wrote: > Signed-off-by: Adam Duskett <aduskett@gmail.com> Applied to master, thanks. Regards, Arnout > --- > package/python-txtorcon/python-txtorcon.hash | 4 ++-- > package/python-txtorcon/python-txtorcon.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-txtorcon/python-txtorcon.hash b/package/python-txtorcon/python-txtorcon.hash > index 803933f1e6..af542c7f2e 100644 > --- a/package/python-txtorcon/python-txtorcon.hash > +++ b/package/python-txtorcon/python-txtorcon.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/txtorcon/json > -md5 fb323f9874298a8145dbe8d43c387932 txtorcon-19.1.0.tar.gz > -sha256 25d8e52c3eac45bb90ff958ca7cdd7674fb3284e3a50826a58ab7b9578b15ea5 txtorcon-19.1.0.tar.gz > +md5 dbb53821a3ce3e921e09c5de4f722fdb txtorcon-21.1.0.tar.gz > +sha256 aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6 txtorcon-21.1.0.tar.gz > # Locally computed sha256 checksums > sha256 3ada1c32ef38c23d96d7f4e8f4a226c527f51e0202883c7543b06f9cc5228a2b LICENSE > diff --git a/package/python-txtorcon/python-txtorcon.mk b/package/python-txtorcon/python-txtorcon.mk > index 4df400c3e7..b8414d96d0 100644 > --- a/package/python-txtorcon/python-txtorcon.mk > +++ b/package/python-txtorcon/python-txtorcon.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_TXTORCON_VERSION = 19.1.0 > +PYTHON_TXTORCON_VERSION = 21.1.0 > PYTHON_TXTORCON_SOURCE = txtorcon-$(PYTHON_TXTORCON_VERSION).tar.gz > -PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/8c/26/d5b2fba4ffbcb23957ff2cee4d7d0a2d667372b9eb04807058bd561c8e8f > +PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/eb/43/2426009377cef519c53bdc8969590cb100e9fd745846859963c881c6d176 > PYTHON_TXTORCON_SETUP_TYPE = setuptools > PYTHON_TXTORCON_LICENSE = MIT > PYTHON_TXTORCON_LICENSE_FILES = LICENSE > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v2 04/11] package/python-watchdog: bump to version 2.1.6 2021-10-14 22:58 [Buildroot] [PATCH v2 00/11] package/python3: bump to version 3.10 Adam Duskett ` (2 preceding siblings ...) 2021-10-14 22:58 ` [Buildroot] [PATCH v2 03/11] package/python-txtorcon: bump to version 21.1.0 Adam Duskett @ 2021-10-14 22:58 ` Adam Duskett 2021-10-25 19:14 ` Arnout Vandecappelle 2021-10-14 22:58 ` [Buildroot] [PATCH v2 05/11] package/python-certifi: add host variant Adam Duskett ` (6 subsequent siblings) 10 siblings, 1 reply; 22+ messages in thread From: Adam Duskett @ 2021-10-14 22:58 UTC (permalink / raw) To: buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt, Adam Duskett Signed-off-by: Adam Duskett <aduskett@gmail.com> --- package/python-watchdog/python-watchdog.hash | 11 +++++------ package/python-watchdog/python-watchdog.mk | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package/python-watchdog/python-watchdog.hash b/package/python-watchdog/python-watchdog.hash index 701c7991a5..3b633f9156 100644 --- a/package/python-watchdog/python-watchdog.hash +++ b/package/python-watchdog/python-watchdog.hash @@ -1,7 +1,6 @@ -# md5, sha256 from https://pypi.python.org/pypi/watchdog/json -md5 7cdc103f607e72fc32c206301a72d1b2 watchdog-0.9.0.tar.gz -sha256 965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d watchdog-0.9.0.tar.gz - -# Hash for license files -sha256 14e636faf5889138a1bb7a8498ccbb0266aee31d2dc475201a10448e56ed3d96 COPYING +# md5, sha256 from https://pypi.org/pypi/watchdog/json +md5 6aac660b0f3358c63658806a0579b832 watchdog-2.1.6.tar.gz +sha256 a36e75df6c767cbf46f61a91c70b3ba71811dfa0aca4a324d9407a06a8b7a2e7 watchdog-2.1.6.tar.gz +# Locally computed sha256 checksums +sha256 02c8760f988a76e92a9d6cb525456a86f7b0fd1953870dd491de5955cb974d41 COPYING sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-watchdog/python-watchdog.mk b/package/python-watchdog/python-watchdog.mk index 44929a65ac..2dafef97e1 100644 --- a/package/python-watchdog/python-watchdog.mk +++ b/package/python-watchdog/python-watchdog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WATCHDOG_VERSION = 0.9.0 +PYTHON_WATCHDOG_VERSION = 2.1.6 PYTHON_WATCHDOG_SOURCE = watchdog-$(PYTHON_WATCHDOG_VERSION).tar.gz -PYTHON_WATCHDOG_SITE = https://pypi.python.org/packages/bb/e3/5a55d48a29300160779f0a0d2776d17c1b762a2039b36de528b093b87d5b +PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/e8/a8/fc4edd7d768361b00ea850e5310211d157df6b5a1db6148dd434e787d898 PYTHON_WATCHDOG_SETUP_TYPE = setuptools PYTHON_WATCHDOG_LICENSE = Apache-2.0 PYTHON_WATCHDOG_LICENSE_FILES = LICENSE COPYING -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v2 04/11] package/python-watchdog: bump to version 2.1.6 2021-10-14 22:58 ` [Buildroot] [PATCH v2 04/11] package/python-watchdog: bump to version 2.1.6 Adam Duskett @ 2021-10-25 19:14 ` Arnout Vandecappelle 0 siblings, 0 replies; 22+ messages in thread From: Arnout Vandecappelle @ 2021-10-25 19:14 UTC (permalink / raw) To: Adam Duskett, buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt On 15/10/2021 00:58, Adam Duskett wrote: > Signed-off-by: Adam Duskett <aduskett@gmail.com> > --- > package/python-watchdog/python-watchdog.hash | 11 +++++------ > package/python-watchdog/python-watchdog.mk | 4 ++-- > 2 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/package/python-watchdog/python-watchdog.hash b/package/python-watchdog/python-watchdog.hash > index 701c7991a5..3b633f9156 100644 > --- a/package/python-watchdog/python-watchdog.hash > +++ b/package/python-watchdog/python-watchdog.hash > @@ -1,7 +1,6 @@ > -# md5, sha256 from https://pypi.python.org/pypi/watchdog/json > -md5 7cdc103f607e72fc32c206301a72d1b2 watchdog-0.9.0.tar.gz > -sha256 965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d watchdog-0.9.0.tar.gz > - > -# Hash for license files > -sha256 14e636faf5889138a1bb7a8498ccbb0266aee31d2dc475201a10448e56ed3d96 COPYING > +# md5, sha256 from https://pypi.org/pypi/watchdog/json > +md5 6aac660b0f3358c63658806a0579b832 watchdog-2.1.6.tar.gz > +sha256 a36e75df6c767cbf46f61a91c70b3ba71811dfa0aca4a324d9407a06a8b7a2e7 watchdog-2.1.6.tar.gz > +# Locally computed sha256 checksums > +sha256 02c8760f988a76e92a9d6cb525456a86f7b0fd1953870dd491de5955cb974d41 COPYING In this case, it's "and contributors" that is added to the authors. Applied to master, thanks. However, I gave up applying the rest of the series for the time being. Regards, Arnout > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/python-watchdog/python-watchdog.mk b/package/python-watchdog/python-watchdog.mk > index 44929a65ac..2dafef97e1 100644 > --- a/package/python-watchdog/python-watchdog.mk > +++ b/package/python-watchdog/python-watchdog.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_WATCHDOG_VERSION = 0.9.0 > +PYTHON_WATCHDOG_VERSION = 2.1.6 > PYTHON_WATCHDOG_SOURCE = watchdog-$(PYTHON_WATCHDOG_VERSION).tar.gz > -PYTHON_WATCHDOG_SITE = https://pypi.python.org/packages/bb/e3/5a55d48a29300160779f0a0d2776d17c1b762a2039b36de528b093b87d5b > +PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/e8/a8/fc4edd7d768361b00ea850e5310211d157df6b5a1db6148dd434e787d898 > PYTHON_WATCHDOG_SETUP_TYPE = setuptools > PYTHON_WATCHDOG_LICENSE = Apache-2.0 > PYTHON_WATCHDOG_LICENSE_FILES = LICENSE COPYING > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v2 05/11] package/python-certifi: add host variant 2021-10-14 22:58 [Buildroot] [PATCH v2 00/11] package/python3: bump to version 3.10 Adam Duskett ` (3 preceding siblings ...) 2021-10-14 22:58 ` [Buildroot] [PATCH v2 04/11] package/python-watchdog: bump to version 2.1.6 Adam Duskett @ 2021-10-14 22:58 ` Adam Duskett 2021-10-25 19:21 ` Arnout Vandecappelle 2021-10-14 22:58 ` [Buildroot] [PATCH v2 06/11] package/python-matplotlib: bump to version 3.4.3 Adam Duskett ` (5 subsequent siblings) 10 siblings, 1 reply; 22+ messages in thread From: Adam Duskett @ 2021-10-14 22:58 UTC (permalink / raw) To: buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt, Adam Duskett matplotlib 3.4.3 depends on host-python-certifi Signed-off-by: Adam Duskett <aduskett@gmail.com> --- package/python-certifi/python-certifi.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index 7c63633a8d..486548f8c2 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -12,3 +12,4 @@ PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) PYTHON_CERTIFI_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v2 05/11] package/python-certifi: add host variant 2021-10-14 22:58 ` [Buildroot] [PATCH v2 05/11] package/python-certifi: add host variant Adam Duskett @ 2021-10-25 19:21 ` Arnout Vandecappelle 0 siblings, 0 replies; 22+ messages in thread From: Arnout Vandecappelle @ 2021-10-25 19:21 UTC (permalink / raw) To: Adam Duskett, buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt On 15/10/2021 00:58, Adam Duskett wrote: > matplotlib 3.4.3 depends on host-python-certifi > > Signed-off-by: Adam Duskett <aduskett@gmail.com> Applied to master, thanks. Regards, Arnout > --- > package/python-certifi/python-certifi.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk > index 7c63633a8d..486548f8c2 100644 > --- a/package/python-certifi/python-certifi.mk > +++ b/package/python-certifi/python-certifi.mk > @@ -12,3 +12,4 @@ PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem) > PYTHON_CERTIFI_LICENSE_FILES = LICENSE > > $(eval $(python-package)) > +$(eval $(host-python-package)) > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v2 06/11] package/python-matplotlib: bump to version 3.4.3 2021-10-14 22:58 [Buildroot] [PATCH v2 00/11] package/python3: bump to version 3.10 Adam Duskett ` (4 preceding siblings ...) 2021-10-14 22:58 ` [Buildroot] [PATCH v2 05/11] package/python-certifi: add host variant Adam Duskett @ 2021-10-14 22:58 ` Adam Duskett 2021-10-25 19:22 ` Arnout Vandecappelle 2021-10-14 22:58 ` [Buildroot] [PATCH v2 07/11] package/python-numpy: bump to version 1.21.2 Adam Duskett ` (4 subsequent siblings) 10 siblings, 1 reply; 22+ messages in thread From: Adam Duskett @ 2021-10-14 22:58 UTC (permalink / raw) To: buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt, Adam Duskett - Remove upstreamed patches - Add BR2_PACKAGE_PYTHON_CERTIFI and BR2_PACKAGE_QHULL as dependencies - Add a new file: setup.cfg. This file is needed to force matplotlib to use the system-provided freetype and qhull, and to disable lto. The setup.cfg file is copied to the source directory before configuring. LTO must be disabled or else compile errors such as: "Relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `_ZSt3hexRSt8ios_base' which may bind externally can not be used when making a shared object; recompile with -fPIC" Signed-off-by: Adam Duskett <aduskett@gmail.com> --- .../0001-Fix-invalid-inclusion-headers.patch | 29 --- ...st-11983-from-anntzer-builddepchecks.patch | 170 ------------------ package/python-matplotlib/Config.in | 2 + .../python-matplotlib/python-matplotlib.hash | 2 +- .../python-matplotlib/python-matplotlib.mk | 14 +- package/python-matplotlib/setup.cfg | 10 ++ 6 files changed, 23 insertions(+), 204 deletions(-) delete mode 100644 package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch delete mode 100644 package/python-matplotlib/0002-Merge-pull-request-11983-from-anntzer-builddepchecks.patch create mode 100644 package/python-matplotlib/setup.cfg diff --git a/package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch b/package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch deleted file mode 100644 index b10bfb326f..0000000000 --- a/package/python-matplotlib/0001-Fix-invalid-inclusion-headers.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b0232c3cf1051749dd1e2bd0ec7c5c0a3a008d2f Mon Sep 17 00:00:00 2001 -From: Jugurtha BELKALEM <jugurtha.belkalem@smile.fr> -Date: Thu, 9 May 2019 15:06:36 +0200 -Subject: [PATCH] Fix invalid inclusion headers - -By default, matplotlib includes headers from host -machine which breaks the build process. - -Signed-off-by: Jugurtha BELKALEM <jugurtha.belkalem@smile.fr> ---- - python-matplotlib-3.0.3/setupext.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setupext.py b/setupext.py -index fc82d5d..eb978d2 100644 ---- a/setupext.py -+++ b/setupext.py -@@ -267,7 +267,7 @@ def get_base_dirs(): - 'gnu0': ['/usr'], - 'aix5': ['/usr/local'], - } -- return basedir_map.get(sys.platform, ['/usr/local', '/usr']) -+ return basedir_map.get(sys.platform, []) - - - def get_include_dirs(): --- -2.7.4 - diff --git a/package/python-matplotlib/0002-Merge-pull-request-11983-from-anntzer-builddepchecks.patch b/package/python-matplotlib/0002-Merge-pull-request-11983-from-anntzer-builddepchecks.patch deleted file mode 100644 index b3a22acbb4..0000000000 --- a/package/python-matplotlib/0002-Merge-pull-request-11983-from-anntzer-builddepchecks.patch +++ /dev/null @@ -1,170 +0,0 @@ -From 923ce72409f184bd8e8c61b196260891036ba87e Mon Sep 17 00:00:00 2001 -From: Antony Lee <anntzer.lee@gmail.com> -Date: Thu, 30 Aug 2018 15:27:55 +0200 -Subject: [PATCH] Simplify version checks for freetype and libpng. - -Currently, setupext.py replicates a lot of work done by the compiler to -check whether header files are present, and whether freetype and libpng -have sufficiently recent versions. - -Instead, we can just add a small stub source file at the top of the -extension sources which just tries to include the header and checks the -version macros. If the header is not found, compilation will -immediately abort with `foo.h: No such file or directory`; if the -version is too old, we can emit an appropriate error message (`#pragma -message` is supported by all major compilers and allows expanding of -macros in the error message). - -[Retrieved from: -https://github.com/matplotlib/matplotlib/commit/d1060a885309ec7ac19ca912d3011a5eb1673bd5] -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - setupext.py | 83 +++++----------------------------------- - src/checkdep_freetype2.c | 13 +++++++ - src/checkdep_libpng.c | 5 +++ - 3 files changed, 28 insertions(+), 73 deletions(-) - create mode 100644 src/checkdep_freetype2.c - create mode 100644 src/checkdep_libpng.c - -diff --git a/setupext.py b/setupext.py -index d5f4b81f562..a5163e39288 100644 ---- a/setupext.py -+++ b/setupext.py -@@ -814,6 +814,13 @@ def add_flags(self, ext, add_sources=True): - for x in agg_sources) - - -+# For FreeType2 and libpng, we add a separate checkdep_foo.c source to at the -+# top of the extension sources. This file is compiled first and immediately -+# aborts the compilation either with "foo.h: No such file or directory" if the -+# header is not found, or an appropriate error message if the header indicates -+# a too-old version. -+ -+ - class FreeType(SetupPackage): - name = "freetype" - pkg_names = { -@@ -825,59 +832,8 @@ class FreeType(SetupPackage): - "windows_url": "http://gnuwin32.sourceforge.net/packages/freetype.htm" - } - -- def check(self): -- if options.get('local_freetype'): -- return "Using local version for testing" -- -- if sys.platform == 'win32': -- try: -- check_include_file(get_include_dirs(), 'ft2build.h', 'freetype') -- except CheckFailed: -- check_include_file(get_include_dirs(), os.path.join('freetype2', 'ft2build.h'), 'freetype') -- return 'Using unknown version found on system.' -- -- status, output = subprocess.getstatusoutput( -- "freetype-config --ftversion") -- if status == 0: -- version = output -- else: -- version = None -- -- # Early versions of freetype grep badly inside freetype-config, -- # so catch those cases. (tested with 2.5.3). -- if version is None or 'No such file or directory\ngrep:' in version: -- version = self.version_from_header() -- -- # pkg_config returns the libtool version rather than the -- # freetype version so we need to explicitly pass the version -- # to _check_for_pkg_config -- return self._check_for_pkg_config( -- 'freetype2', 'ft2build.h', -- min_version='2.3', version=version) -- -- def version_from_header(self): -- version = 'unknown' -- ext = self.get_extension() -- if ext is None: -- return version -- # Return the first version found in the include dirs. -- for include_dir in ext.include_dirs: -- header_fname = os.path.join(include_dir, 'freetype.h') -- if os.path.exists(header_fname): -- major, minor, patch = 0, 0, 0 -- with open(header_fname, 'r') as fh: -- for line in fh: -- if line.startswith('#define FREETYPE_'): -- value = line.rsplit(' ', 1)[1].strip() -- if 'MAJOR' in line: -- major = value -- elif 'MINOR' in line: -- minor = value -- else: -- patch = value -- return '.'.join([major, minor, patch]) -- - def add_flags(self, ext): -+ ext.sources.insert(0, 'src/checkdep_freetype2.c') - if options.get('local_freetype'): - src_path = os.path.join( - 'build', 'freetype-{0}'.format(LOCAL_FREETYPE_VERSION)) -@@ -1058,30 +1014,11 @@ class Png(SetupPackage): - "windows_url": "http://gnuwin32.sourceforge.net/packages/libpng.htm" - } - -- def check(self): -- if sys.platform == 'win32': -- check_include_file(get_include_dirs(), 'png.h', 'png') -- return 'Using unknown version found on system.' -- -- status, output = subprocess.getstatusoutput("libpng-config --version") -- if status == 0: -- version = output -- else: -- version = None -- -- try: -- return self._check_for_pkg_config( -- 'libpng', 'png.h', -- min_version='1.2', version=version) -- except CheckFailed as e: -- if has_include_file(get_include_dirs(), 'png.h'): -- return str(e) + ' Using unknown version found on system.' -- raise -- - def get_extension(self): - sources = [ -+ 'src/checkdep_libpng.c', - 'src/_png.cpp', -- 'src/mplutils.cpp' -+ 'src/mplutils.cpp', - ] - ext = make_extension('matplotlib._png', sources) - pkg_config.setup_extension( -diff --git a/src/checkdep_freetype2.c b/src/checkdep_freetype2.c -new file mode 100644 -index 00000000000..bf9a8c94e38 ---- /dev/null -+++ b/src/checkdep_freetype2.c -@@ -0,0 +1,13 @@ -+#include <ft2build.h> -+#include FT_FREETYPE_H -+ -+#define XSTR(x) STR(x) -+#define STR(x) #x -+ -+#pragma message("Compiling with FreeType version " \ -+ XSTR(FREETYPE_MAJOR) "." XSTR(FREETYPE_MINOR) "." XSTR(FREETYPE_PATCH) ".") -+#if FREETYPE_MAJOR << 16 + FREETYPE_MINOR << 8 + FREETYPE_PATCH < 0x020300 -+ #error "FreeType version 2.3 or higher is required." \ -+ "Consider setting the MPLLOCALFREETYPE environment variable to 1." -+ #error -+#endif -diff --git a/src/checkdep_libpng.c b/src/checkdep_libpng.c -new file mode 100644 -index 00000000000..5ebe5cbe4d7 ---- /dev/null -+++ b/src/checkdep_libpng.c -@@ -0,0 +1,5 @@ -+#include <png.h> -+#pragma message("Compiling with libpng version " PNG_LIBPNG_VER_STRING ".") -+#if PNG_LIBPNG_VER < 10200 -+ #error "libpng version 1.2 or higher is required." -+#endif diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index afc090856f..f38618d709 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_FREETYPE # runtime select BR2_PACKAGE_LIBPNG # runtime + select BR2_PACKAGE_PYTHON_CERTIFI select BR2_PACKAGE_PYTHON_CYCLER select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_DATEUTIL # runtime @@ -13,6 +14,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB select BR2_PACKAGE_PYTHON_NUMPY # runtime select BR2_PACKAGE_PYTHON_PYPARSING # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime + select BR2_PACKAGE_QHULL select BR2_PACKAGE_ZLIB # runtime help Matplotlib strives to produce publication quality 2D diff --git a/package/python-matplotlib/python-matplotlib.hash b/package/python-matplotlib/python-matplotlib.hash index ccb22eefa5..81e83ac0de 100644 --- a/package/python-matplotlib/python-matplotlib.hash +++ b/package/python-matplotlib/python-matplotlib.hash @@ -1,4 +1,4 @@ # sha256 from https://pypi.org/project/matplotlib/#files -sha256 e1d33589e32f482d0a7d1957bf473d43341115d40d33f578dad44432e47df7b7 matplotlib-3.0.3.tar.gz +sha256 fc4f526dfdb31c9bd6b8ca06bf9fab663ca12f3ec9cdf4496fb44bc680140318 matplotlib-3.4.3.tar.gz # Locally computed sha256 checksums sha256 5a1a81ea301728c8bba2933da832c0cd62229daf20893a024ab3d53244468dbc LICENSE/LICENSE diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk index 8d00ac8a07..2f55dd5d5d 100644 --- a/package/python-matplotlib/python-matplotlib.mk +++ b/package/python-matplotlib/python-matplotlib.mk @@ -4,17 +4,23 @@ # ################################################################################ -PYTHON_MATPLOTLIB_VERSION = 3.0.3 +PYTHON_MATPLOTLIB_VERSION = 3.4.3 PYTHON_MATPLOTLIB_SOURCE = matplotlib-$(PYTHON_MATPLOTLIB_VERSION).tar.gz -PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/26/04/8b381d5b166508cc258632b225adbafec49bbe69aa9a4fa1f1b461428313 +PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/21/37/197e68df384ff694f78d687a49ad39f96c67b8d75718bc61503e1676b617 PYTHON_MATPLOTLIB_LICENSE = Python-2.0 PYTHON_MATPLOTLIB_LICENSE_FILES = LICENSE/LICENSE -PYTHON_MATPLOTLIB_DEPENDENCIES = host-pkgconf freetype host-python-numpy \ - libpng python-cycler +PYTHON_MATPLOTLIB_DEPENDENCIES = \ + host-pkgconf freetype host-python-numpy \ + libpng python-cycler host-python-certifi qhull PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools ifeq ($(BR2_PACKAGE_PYTHON_MATPLOTLIB_QT),y) PYTHON_MATPLOTLIB_DEPENDENCIES += python-pyqt5 endif +define PYTHON_MATPLOTLIB_COPY_SETUP_CFG + cp $(PYTHON_MATPLOTLIB_PKGDIR)/setup.cfg $(@D)/setup.cfg +endef +PYTHON_MATPLOTLIB_PRE_CONFIGURE_HOOKS += PYTHON_MATPLOTLIB_COPY_SETUP_CFG + $(eval $(python-package)) diff --git a/package/python-matplotlib/setup.cfg b/package/python-matplotlib/setup.cfg new file mode 100644 index 0000000000..4bda0d4376 --- /dev/null +++ b/package/python-matplotlib/setup.cfg @@ -0,0 +1,10 @@ +[libs] +# Disable LTO to prevent the following error: +# Relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `_ZSt3hexRSt8ios_base' +# which may bind externally can not be used when making a shared object; +# recompile with -fPIC +enable_lto = False + +# Freetype and qhull are provided by Buildroot +system_freetype = True +system_qhull = True -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v2 06/11] package/python-matplotlib: bump to version 3.4.3 2021-10-14 22:58 ` [Buildroot] [PATCH v2 06/11] package/python-matplotlib: bump to version 3.4.3 Adam Duskett @ 2021-10-25 19:22 ` Arnout Vandecappelle 0 siblings, 0 replies; 22+ messages in thread From: Arnout Vandecappelle @ 2021-10-25 19:22 UTC (permalink / raw) To: Adam Duskett, buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt On 15/10/2021 00:58, Adam Duskett wrote: > - Remove upstreamed patches > - Add BR2_PACKAGE_PYTHON_CERTIFI and BR2_PACKAGE_QHULL as dependencies > - Add a new file: setup.cfg. This file is needed to force matplotlib to use > the system-provided freetype and qhull, and to disable lto. > The setup.cfg file is copied to the source directory before configuring. > > LTO must be disabled or else compile errors such as: > "Relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `_ZSt3hexRSt8ios_base' > which may bind externally can not be used when making a shared object; > recompile with -fPIC" > > Signed-off-by: Adam Duskett <aduskett@gmail.com> [snip] > diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in > index afc090856f..f38618d709 100644 > --- a/package/python-matplotlib/Config.in > +++ b/package/python-matplotlib/Config.in > @@ -6,6 +6,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB > depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy > select BR2_PACKAGE_FREETYPE # runtime > select BR2_PACKAGE_LIBPNG # runtime > + select BR2_PACKAGE_PYTHON_CERTIFI Since you don't depend on it, I guess this is a runtime dependency, so I added that. > select BR2_PACKAGE_PYTHON_CYCLER > select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON_DATEUTIL # runtime > @@ -13,6 +14,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB > select BR2_PACKAGE_PYTHON_NUMPY # runtime > select BR2_PACKAGE_PYTHON_PYPARSING # runtime > select BR2_PACKAGE_PYTHON3_ZLIB # runtime > + select BR2_PACKAGE_QHULL > select BR2_PACKAGE_ZLIB # runtime > help > Matplotlib strives to produce publication quality 2D > diff --git a/package/python-matplotlib/python-matplotlib.hash b/package/python-matplotlib/python-matplotlib.hash > index ccb22eefa5..81e83ac0de 100644 > --- a/package/python-matplotlib/python-matplotlib.hash > +++ b/package/python-matplotlib/python-matplotlib.hash > @@ -1,4 +1,4 @@ > # sha256 from https://pypi.org/project/matplotlib/#files > -sha256 e1d33589e32f482d0a7d1957bf473d43341115d40d33f578dad44432e47df7b7 matplotlib-3.0.3.tar.gz > +sha256 fc4f526dfdb31c9bd6b8ca06bf9fab663ca12f3ec9cdf4496fb44bc680140318 matplotlib-3.4.3.tar.gz > # Locally computed sha256 checksums > sha256 5a1a81ea301728c8bba2933da832c0cd62229daf20893a024ab3d53244468dbc LICENSE/LICENSE > diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk > index 8d00ac8a07..2f55dd5d5d 100644 > --- a/package/python-matplotlib/python-matplotlib.mk > +++ b/package/python-matplotlib/python-matplotlib.mk > @@ -4,17 +4,23 @@ > # > ################################################################################ > > -PYTHON_MATPLOTLIB_VERSION = 3.0.3 > +PYTHON_MATPLOTLIB_VERSION = 3.4.3 > PYTHON_MATPLOTLIB_SOURCE = matplotlib-$(PYTHON_MATPLOTLIB_VERSION).tar.gz > -PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/26/04/8b381d5b166508cc258632b225adbafec49bbe69aa9a4fa1f1b461428313 > +PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/21/37/197e68df384ff694f78d687a49ad39f96c67b8d75718bc61503e1676b617 > PYTHON_MATPLOTLIB_LICENSE = Python-2.0 > PYTHON_MATPLOTLIB_LICENSE_FILES = LICENSE/LICENSE > -PYTHON_MATPLOTLIB_DEPENDENCIES = host-pkgconf freetype host-python-numpy \ > - libpng python-cycler > +PYTHON_MATPLOTLIB_DEPENDENCIES = \ > + host-pkgconf freetype host-python-numpy \ > + libpng python-cycler host-python-certifi qhull I've taken the opportunity to make this one per line and sort alphabetically. Applied to master, thanks. Regards, Arnout > PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools > > ifeq ($(BR2_PACKAGE_PYTHON_MATPLOTLIB_QT),y) > PYTHON_MATPLOTLIB_DEPENDENCIES += python-pyqt5 > endif > > +define PYTHON_MATPLOTLIB_COPY_SETUP_CFG > + cp $(PYTHON_MATPLOTLIB_PKGDIR)/setup.cfg $(@D)/setup.cfg > +endef > +PYTHON_MATPLOTLIB_PRE_CONFIGURE_HOOKS += PYTHON_MATPLOTLIB_COPY_SETUP_CFG > + > $(eval $(python-package)) > diff --git a/package/python-matplotlib/setup.cfg b/package/python-matplotlib/setup.cfg > new file mode 100644 > index 0000000000..4bda0d4376 > --- /dev/null > +++ b/package/python-matplotlib/setup.cfg > @@ -0,0 +1,10 @@ > +[libs] > +# Disable LTO to prevent the following error: > +# Relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `_ZSt3hexRSt8ios_base' > +# which may bind externally can not be used when making a shared object; > +# recompile with -fPIC > +enable_lto = False > + > +# Freetype and qhull are provided by Buildroot > +system_freetype = True > +system_qhull = True > _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v2 07/11] package/python-numpy: bump to version 1.21.2 2021-10-14 22:58 [Buildroot] [PATCH v2 00/11] package/python3: bump to version 3.10 Adam Duskett ` (5 preceding siblings ...) 2021-10-14 22:58 ` [Buildroot] [PATCH v2 06/11] package/python-matplotlib: bump to version 3.4.3 Adam Duskett @ 2021-10-14 22:58 ` Adam Duskett 2021-12-29 23:07 ` Thomas Petazzoni 2021-10-14 22:58 ` [Buildroot] [PATCH v2 08/11] package/python-pyalsa: add 0001-fix-pytuple-set-item-usage-no-return-value.patch Adam Duskett ` (3 subsequent siblings) 10 siblings, 1 reply; 22+ messages in thread From: Adam Duskett @ 2021-10-14 22:58 UTC (permalink / raw) To: buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt, Adam Duskett Update license file information as well. Signed-off-by: Adam Duskett <aduskett@gmail.com> --- package/python-numpy/python-numpy.hash | 11 +++++------ package/python-numpy/python-numpy.mk | 16 +++++++++------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash index ff9d02643c..7c111f7bc8 100644 --- a/package/python-numpy/python-numpy.hash +++ b/package/python-numpy/python-numpy.hash @@ -1,9 +1,8 @@ -# Copied from https://github.com/numpy/numpy/releases/tag/v1.18.1 -sha256 da204ce460aa4247e595b7c7189d2fb2ed5f796bc03197055de01dac61d0125e numpy-1.18.2.tar.gz +# Copied from https://github.com/numpy/numpy/releases/tag/v1.21.2 +sha256 76af194fbc117934ec5bbe2ff15177adbd05aeed23f18ee209ed88edcd777e05 numpy-1.21.2.tar.gz # License files, locally calculated -sha256 ad81d0c21843ba6ce6fe5fa3eaacb61120be70cd798c52f63df3f4c12a843f0c LICENSE.txt -sha256 d3045980e80a6b39f98586c24bc7f39a7625b4b9f08ce72e367d12814743d047 numpy/core/src/multiarray/dragon4.c -sha256 426a5a484480f57a295db48c2c04f47bb3274752dd82a7fd6541dfa2cb90f641 doc/sphinxext/LICENSE.txt -sha256 154a8706fa0fdeff1073bf6239c4ecf51f562ab107066eef839dade1a45c824c doc/scipy-sphinx-theme/LICENSE.txt +sha256 bc1b0af15cdc9415ea26c5f1df352c226ac86425ec0fb9ab38d111018bf1c6f2 LICENSE.txt +sha256 2be6947e0432ecf7950ee8fe38681316749dd06d1de17c9ec4de6d2f55adb3a1 numpy/core/src/multiarray/dragon4.c +sha256 fbc539f47d0cf83bc61378080fb873d5c14630126cacbfe754035c3926daa5ec numpy/core/include/numpy/libdivide/LICENSE.txt sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt sha256 badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e tools/npy_tempita/license.txt diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 72c6e0c981..ae72b87db0 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -4,15 +4,17 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.18.2 +PYTHON_NUMPY_VERSION = 1.21.2 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) -PYTHON_NUMPY_LICENSE = BSD-3-Clause, BSD-2-Clause, PSF, Apache-2.0, MIT, Zlib -PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt doc/sphinxext/LICENSE.txt \ - doc/scipy-sphinx-theme/LICENSE.txt \ - numpy/linalg/lapack_lite/LICENSE.txt \ - tools/npy_tempita/license.txt \ - numpy/core/src/multiarray/dragon4.c +PYTHON_NUMPY_LICENSE = BSD-3-Clause, MIT, Zlib +PYTHON_NUMPY_LICENSE_FILES = \ + LICENSE.txt \ + numpy/core/src/multiarray/dragon4.c \ + numpy/core/include/numpy/libdivide/LICENSE.txt \ + numpy/linalg/lapack_lite/LICENSE.txt \ + tools/npy_tempita/license.txt + PYTHON_NUMPY_SETUP_TYPE = setuptools PYTHON_NUMPY_DEPENDENCIES = host-python-cython HOST_PYTHON_NUMPY_DEPENDENCIES = host-python-cython -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v2 07/11] package/python-numpy: bump to version 1.21.2 2021-10-14 22:58 ` [Buildroot] [PATCH v2 07/11] package/python-numpy: bump to version 1.21.2 Adam Duskett @ 2021-12-29 23:07 ` Thomas Petazzoni 0 siblings, 0 replies; 22+ messages in thread From: Thomas Petazzoni @ 2021-12-29 23:07 UTC (permalink / raw) To: Adam Duskett Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, buildroot, Oli Vogt On Thu, 14 Oct 2021 15:58:45 -0700 Adam Duskett <aduskett@gmail.com> wrote: > Update license file information as well. > > Signed-off-by: Adam Duskett <aduskett@gmail.com> > --- > package/python-numpy/python-numpy.hash | 11 +++++------ > package/python-numpy/python-numpy.mk | 16 +++++++++------- > 2 files changed, 14 insertions(+), 13 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v2 08/11] package/python-pyalsa: add 0001-fix-pytuple-set-item-usage-no-return-value.patch 2021-10-14 22:58 [Buildroot] [PATCH v2 00/11] package/python3: bump to version 3.10 Adam Duskett ` (6 preceding siblings ...) 2021-10-14 22:58 ` [Buildroot] [PATCH v2 07/11] package/python-numpy: bump to version 1.21.2 Adam Duskett @ 2021-10-14 22:58 ` Adam Duskett 2021-12-29 23:13 ` Thomas Petazzoni 2021-10-14 22:58 ` [Buildroot] [PATCH v2 09/11] package/python-django-enumfields: bump to version Adam Duskett ` (2 subsequent siblings) 10 siblings, 1 reply; 22+ messages in thread From: Adam Duskett @ 2021-10-14 22:58 UTC (permalink / raw) To: buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt, Adam Duskett This patch is a backport of commit 5ea2f8709b4d091700750661231f8a3ddce0fc7c and fixes compatibility with python 3.10. Signed-off-by: Adam Duskett <aduskett@gmail.com> --- ...tuple-set-item-usage-no-return-value.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/python-pyalsa/0001-fix-pytuple-set-item-usage-no-return-value.patch diff --git a/package/python-pyalsa/0001-fix-pytuple-set-item-usage-no-return-value.patch b/package/python-pyalsa/0001-fix-pytuple-set-item-usage-no-return-value.patch new file mode 100644 index 0000000000..d3db1ed2e0 --- /dev/null +++ b/package/python-pyalsa/0001-fix-pytuple-set-item-usage-no-return-value.patch @@ -0,0 +1,48 @@ +From 5ea2f8709b4d091700750661231f8a3ddce0fc7c Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela <perex@perex.cz> +Date: Thu, 10 Dec 2020 16:00:50 +0100 +Subject: [PATCH] Fix PyTuple_SET_ITEM() usage - no return value + +As noted in bpo-30459 (link bellow) the PyTuple_SET_ITEM() macro +has not a return value. Let's make code compatible with python 3.10. + +Link: https://bugs.python.org/issue30459 +BugLink: https://github.com/alsa-project/alsa-python/issues/2 +From upstream-commit: 5ea2f8709b4d091700750661231f8a3ddce0fc7c +Signed-off-by: Jaroslav Kysela <perex@perex.cz> +Signed-off-by: Adam Duskett <aduskett@gmail.com> +--- + pyalsa/alsahcontrol.c | 4 ++-- + pyalsa/alsamixer.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pyalsa/alsahcontrol.c b/pyalsa/alsahcontrol.c +index ebee1b7..7c9321f 100644 +--- a/pyalsa/alsahcontrol.c ++++ b/pyalsa/alsahcontrol.c +@@ -1543,8 +1543,8 @@ static int element_callback(snd_hctl_elem_t *elem, unsigned int mask) + + t = PyTuple_New(2); + if (t) { +- if (PyTuple_SET_ITEM(t, 0, (PyObject *)pyhelem)) +- Py_INCREF(pyhelem); ++ PyTuple_SET_ITEM(t, 0, (PyObject *)pyhelem); ++ Py_INCREF(pyhelem); + PyTuple_SET_ITEM(t, 1, PyInt_FromLong(mask)); + r = PyObject_CallObject(o, t); + Py_DECREF(t); +diff --git a/pyalsa/alsamixer.c b/pyalsa/alsamixer.c +index 39d7387..91fe198 100644 +--- a/pyalsa/alsamixer.c ++++ b/pyalsa/alsamixer.c +@@ -1348,8 +1348,8 @@ static int element_callback(snd_mixer_elem_t *elem, unsigned int mask) + + t = PyTuple_New(2); + if (t) { +- if (PyTuple_SET_ITEM(t, 0, (PyObject *)pyelem)) +- Py_INCREF(pyelem); ++ PyTuple_SET_ITEM(t, 0, (PyObject *)pyelem); ++ Py_INCREF(pyelem); + PyTuple_SET_ITEM(t, 1, PyInt_FromLong(mask)); + r = PyObject_CallObject(o, t); + Py_DECREF(t); -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v2 08/11] package/python-pyalsa: add 0001-fix-pytuple-set-item-usage-no-return-value.patch 2021-10-14 22:58 ` [Buildroot] [PATCH v2 08/11] package/python-pyalsa: add 0001-fix-pytuple-set-item-usage-no-return-value.patch Adam Duskett @ 2021-12-29 23:13 ` Thomas Petazzoni 0 siblings, 0 replies; 22+ messages in thread From: Thomas Petazzoni @ 2021-12-29 23:13 UTC (permalink / raw) To: Adam Duskett Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, buildroot, Oli Vogt Hello Adam, On Thu, 14 Oct 2021 15:58:46 -0700 Adam Duskett <aduskett@gmail.com> wrote: > This patch is a backport of commit 5ea2f8709b4d091700750661231f8a3ddce0fc7c and > fixes compatibility with python 3.10. > > Signed-off-by: Adam Duskett <aduskett@gmail.com> > --- > ...tuple-set-item-usage-no-return-value.patch | 48 +++++++++++++++++++ > 1 file changed, 48 insertions(+) > create mode 100644 package/python-pyalsa/0001-fix-pytuple-set-item-usage-no-return-value.patch This patch is no longer needed: commit 1055ae6c6b307331ff50d9e3dfaa82a37c8f9038 has updated python-pyalsa to version 1.2.6, which includes the fix for Python 3.10 build. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v2 09/11] package/python-django-enumfields: bump to version 2021-10-14 22:58 [Buildroot] [PATCH v2 00/11] package/python3: bump to version 3.10 Adam Duskett ` (7 preceding siblings ...) 2021-10-14 22:58 ` [Buildroot] [PATCH v2 08/11] package/python-pyalsa: add 0001-fix-pytuple-set-item-usage-no-return-value.patch Adam Duskett @ 2021-10-14 22:58 ` Adam Duskett 2021-12-29 23:14 ` Thomas Petazzoni 2021-10-14 22:58 ` [Buildroot] [PATCH v2 10/11] package/python-setuptools: bump to version 58.2.0 and split python2 version Adam Duskett 2021-10-14 22:58 ` [Buildroot] [PATCH v2 11/11] package/python3: bump to version 3.10 Adam Duskett 10 siblings, 1 reply; 22+ messages in thread From: Adam Duskett @ 2021-10-14 22:58 UTC (permalink / raw) To: buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt, Adam Duskett Signed-off-by: Adam Duskett <aduskett@gmail.com> --- .../python-django-enumfields/python-django-enumfields.hash | 6 +++--- .../python-django-enumfields/python-django-enumfields.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-django-enumfields/python-django-enumfields.hash b/package/python-django-enumfields/python-django-enumfields.hash index 84eb028e65..352fa8d907 100644 --- a/package/python-django-enumfields/python-django-enumfields.hash +++ b/package/python-django-enumfields/python-django-enumfields.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django-enumfields/json -md5 c9725a2c31ca2949d111815742335279 django-enumfields-1.0.0.tar.gz -sha256 5b0e2dd5973337717ca6bd5a7d9e167e6ae01203c160d4761b88837c4678f219 django-enumfields-1.0.0.tar.gz +md5 e06bcaecd583ee40e30d556bfcbf0d66 django-enumfields-2.1.1.tar.gz +sha256 f64841732a9c343f5071220e0abcf5f51c9472c06e3c33d7c6a7ec27b6087561 django-enumfields-2.1.1.tar.gz # Locally computed sha256 checksums -sha256 5548de8c163dc57bd0a4f5772f1509f2c04f1390251c98ebf060c9d52a223f57 LICENSE +sha256 75b9c8c2514f22d66070ffc975c4d3132de01e0cc7b3a9662731bcb46cd2a042 LICENSE diff --git a/package/python-django-enumfields/python-django-enumfields.mk b/package/python-django-enumfields/python-django-enumfields.mk index 0121bd1173..20abb5bf6a 100644 --- a/package/python-django-enumfields/python-django-enumfields.mk +++ b/package/python-django-enumfields/python-django-enumfields.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DJANGO_ENUMFIELDS_VERSION = 1.0.0 +PYTHON_DJANGO_ENUMFIELDS_VERSION = 2.1.1 PYTHON_DJANGO_ENUMFIELDS_SOURCE = django-enumfields-$(PYTHON_DJANGO_ENUMFIELDS_VERSION).tar.gz -PYTHON_DJANGO_ENUMFIELDS_SITE = https://files.pythonhosted.org/packages/b7/56/3f4e8d8ef6d5577a1b75b3cfae6dff819afd030e3a519a326ec7a7a0b74f +PYTHON_DJANGO_ENUMFIELDS_SITE = https://files.pythonhosted.org/packages/24/a8/aaf2b5ddb697c9bcab53c32cfebe11e536502e07c30646b4756e7214b685 PYTHON_DJANGO_ENUMFIELDS_SETUP_TYPE = setuptools PYTHON_DJANGO_ENUMFIELDS_LICENSE = MIT PYTHON_DJANGO_ENUMFIELDS_LICENSE_FILES = LICENSE -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v2 09/11] package/python-django-enumfields: bump to version 2021-10-14 22:58 ` [Buildroot] [PATCH v2 09/11] package/python-django-enumfields: bump to version Adam Duskett @ 2021-12-29 23:14 ` Thomas Petazzoni 0 siblings, 0 replies; 22+ messages in thread From: Thomas Petazzoni @ 2021-12-29 23:14 UTC (permalink / raw) To: Adam Duskett Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, buildroot, Oli Vogt On Thu, 14 Oct 2021 15:58:47 -0700 Adam Duskett <aduskett@gmail.com> wrote: > Signed-off-by: Adam Duskett <aduskett@gmail.com> > --- > .../python-django-enumfields/python-django-enumfields.hash | 6 +++--- > .../python-django-enumfields/python-django-enumfields.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v2 10/11] package/python-setuptools: bump to version 58.2.0 and split python2 version 2021-10-14 22:58 [Buildroot] [PATCH v2 00/11] package/python3: bump to version 3.10 Adam Duskett ` (8 preceding siblings ...) 2021-10-14 22:58 ` [Buildroot] [PATCH v2 09/11] package/python-django-enumfields: bump to version Adam Duskett @ 2021-10-14 22:58 ` Adam Duskett 2021-10-25 19:22 ` Arnout Vandecappelle 2021-10-14 22:58 ` [Buildroot] [PATCH v2 11/11] package/python3: bump to version 3.10 Adam Duskett 10 siblings, 1 reply; 22+ messages in thread From: Adam Duskett @ 2021-10-14 22:58 UTC (permalink / raw) To: buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt, Adam Duskett Python setuptools 44.0 is not compatible with python 3.10. Unfortunately, python-setuptools 58.2.0 is not compatible with python2. As Buildroot is not ready to end supporting python2, the python-setuptools package must accommodate both the old version for python2 and the new version for python3.10. Changes include: - Add two new directories: package/python-setuptools/44.0.0 and package/python-setuptools/58.2.0 - Add the appropriate patch and hash files to each directory. - Modify python-setuptools.mk to support both setuptools 44.0 and 58.2.0 (setuptools 58.2.0 does not have a .zip on pypi anymore, only a tar.gz) - Point the symlinks in package/python3-setuptools to the files in package/python-setuptools/58.2.0/ Signed-off-by: Adam Duskett <aduskett@gmail.com> --- .../{ => 44.0.0}/0001-add-executable.patch | 0 .../{ => 44.0.0}/python-setuptools.hash | 0 .../58.2.0/0001-add-executable.patch | 72 +++++++++++++++++++ .../58.2.0/python-setuptools.hash | 4 ++ .../python-setuptools/python-setuptools.mk | 13 +++- .../0001-add-executable.patch | 2 +- .../python3-setuptools.hash | 2 +- .../python3-setuptools/python3-setuptools.mk | 14 ++-- 8 files changed, 93 insertions(+), 14 deletions(-) rename package/python-setuptools/{ => 44.0.0}/0001-add-executable.patch (100%) rename package/python-setuptools/{ => 44.0.0}/python-setuptools.hash (100%) create mode 100644 package/python-setuptools/58.2.0/0001-add-executable.patch create mode 100644 package/python-setuptools/58.2.0/python-setuptools.hash diff --git a/package/python-setuptools/0001-add-executable.patch b/package/python-setuptools/44.0.0/0001-add-executable.patch similarity index 100% rename from package/python-setuptools/0001-add-executable.patch rename to package/python-setuptools/44.0.0/0001-add-executable.patch diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/44.0.0/python-setuptools.hash similarity index 100% rename from package/python-setuptools/python-setuptools.hash rename to package/python-setuptools/44.0.0/python-setuptools.hash diff --git a/package/python-setuptools/58.2.0/0001-add-executable.patch b/package/python-setuptools/58.2.0/0001-add-executable.patch new file mode 100644 index 0000000000..23180eb3ec --- /dev/null +++ b/package/python-setuptools/58.2.0/0001-add-executable.patch @@ -0,0 +1,72 @@ +From 9b3d307f8f6a1af88f3f810f5a6cf0835830e1e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> +Date: Mon, 7 Dec 2015 01:14:33 +0100 +Subject: [PATCH 1/1] add executable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add a new --executable option to distribute so that we can +force the shebang line in installed python scripts. + +[Thomas: refresh for setuptools 5.8.] +[Jörg: refresh for setuptools 18.7.1] + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> +--- + setuptools/command/install.py | 2 ++ + setuptools/command/install_scripts.py | 9 +++++++++ + 2 files changed, 11 insertions(+) + +diff --git a/setuptools/command/install.py b/setuptools/command/install.py +index 72b9a3e..6781d2b 100644 +--- a/setuptools/command/install.py ++++ b/setuptools/command/install.py +@@ -16,6 +16,7 @@ class install(orig.install): + """Use easy_install to install the package, w/dependencies""" + + user_options = orig.install.user_options + [ ++ ('executable=', 'e', "specify final destination interpreter path"), + ('old-and-unmanageable', None, "Try not to use this!"), + ('single-version-externally-managed', None, + "used by system package builders to create 'flat' eggs"), +@@ -31,6 +32,7 @@ class install(orig.install): + + def initialize_options(self): + orig.install.initialize_options(self) ++ self.executable = None + self.old_and_unmanageable = None + self.single_version_externally_managed = None + +diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py +index 9cd8eb0..7786150 100644 +--- a/setuptools/command/install_scripts.py ++++ b/setuptools/command/install_scripts.py +@@ -13,6 +13,13 @@ class install_scripts(orig.install_scripts): + def initialize_options(self): + orig.install_scripts.initialize_options(self) + self.no_ep = False ++ self.executable = None ++ ++ def finalize_options(self): ++ orig.install_scripts.finalize_options(self) ++ self.set_undefined_options('install', ++ ('executable','executable') ++ ) + + def run(self): + import setuptools.command.easy_install as ei +@@ -33,6 +40,8 @@ class install_scripts(orig.install_scripts): + ) + bs_cmd = self.get_finalized_command('build_scripts') + exec_param = getattr(bs_cmd, 'executable', None) ++ if self.executable is not None: ++ exec_param = self.executable + try: + bw_cmd = self.get_finalized_command("bdist_wininst") + is_wininst = getattr(bw_cmd, '_is_running', False) +-- +2.30.2 + diff --git a/package/python-setuptools/58.2.0/python-setuptools.hash b/package/python-setuptools/58.2.0/python-setuptools.hash new file mode 100644 index 0000000000..fc334d81bc --- /dev/null +++ b/package/python-setuptools/58.2.0/python-setuptools.hash @@ -0,0 +1,4 @@ +# From https://pypi.org/pypi/setuptools/json +md5 32b6cdce670ce462086d246bea181e9d setuptools-44.0.0.zip +sha256 2c55bdb85d5bb460bd2e3b12052b677879cffcf46c0c688f2e5bf51d36001145 setuptools-58.2.0.tar.gz +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 08a180ce0c..60811d5748 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,16 +4,22 @@ # ################################################################################ -# Please keep in sync with -# package/python3-setuptools/python3-setuptools.mk +ifeq ($(BR2_PACKAGE_PYTHON),y) PYTHON_SETUPTOOLS_VERSION = 44.0.0 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).zip PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 +else # Python3 +PYTHON_SETUPTOOLS_VERSION = 58.2.0 +PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/1e/5c/3d7b3d91a86d71faf5038c5d259ed36b5d05b7804648e2c43251d574a6e6 +endif PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools + +ifeq ($(BR2_PACKAGE_PYTHON),y) HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2 define PYTHON_SETUPTOOLS_EXTRACT_CMDS @@ -27,6 +33,9 @@ define HOST_PYTHON_SETUPTOOLS_EXTRACT_CMDS mv $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION)/* $(@D) $(RM) -r $(@D)/setuptools-$(PYTHON_SETUPTOOLS_VERSION) endef +else +HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python3 +endif $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python3-setuptools/0001-add-executable.patch b/package/python3-setuptools/0001-add-executable.patch index 5bab3d96a1..fa415a809f 120000 --- a/package/python3-setuptools/0001-add-executable.patch +++ b/package/python3-setuptools/0001-add-executable.patch @@ -1 +1 @@ -../python-setuptools/0001-add-executable.patch \ No newline at end of file +../python-setuptools/58.2.0/0001-add-executable.patch \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.hash b/package/python3-setuptools/python3-setuptools.hash index a3af7f0fb1..db56660b57 120000 --- a/package/python3-setuptools/python3-setuptools.hash +++ b/package/python3-setuptools/python3-setuptools.hash @@ -1 +1 @@ -../python-setuptools/python-setuptools.hash \ No newline at end of file +../python-setuptools/58.2.0/python-setuptools.hash \ No newline at end of file diff --git a/package/python3-setuptools/python3-setuptools.mk b/package/python3-setuptools/python3-setuptools.mk index 34d5993120..b6c8ec7b0d 100644 --- a/package/python3-setuptools/python3-setuptools.mk +++ b/package/python3-setuptools/python3-setuptools.mk @@ -6,21 +6,15 @@ # Please keep in sync with # package/python-setuptools/python-setuptools.mk -PYTHON3_SETUPTOOLS_VERSION = 44.0.0 -PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).zip -PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485 +PYTHON3_SETUPTOOLS_VERSION = 58.2.0 +PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(PYTHON3_SETUPTOOLS_VERSION).tar.gz +PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/1e/5c/3d7b3d91a86d71faf5038c5d259ed36b5d05b7804648e2c43251d574a6e6 PYTHON3_SETUPTOOLS_LICENSE = MIT PYTHON3_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON3_SETUPTOOLS_CPE_ID_VENDOR = python PYTHON3_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON3_SETUPTOOLS_SETUP_TYPE = setuptools -HOST_PYTHON3_SETUPTOOLS_DL_SUBDIR = python-setuptools HOST_PYTHON3_SETUPTOOLS_NEEDS_HOST_PYTHON = python3 - -define HOST_PYTHON3_SETUPTOOLS_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(HOST_PYTHON3_SETUPTOOLS_DL_DIR)/$(PYTHON3_SETUPTOOLS_SOURCE) - mv $(@D)/setuptools-$(PYTHON3_SETUPTOOLS_VERSION)/* $(@D) - $(RM) -r $(@D)/setuptools-$(PYTHON3_SETUPTOOLS_VERSION) -endef +HOST_PYTHON3_SETUPTOOLS_DL_SUBDIR = python-setuptools $(eval $(host-python-package)) -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH v2 10/11] package/python-setuptools: bump to version 58.2.0 and split python2 version 2021-10-14 22:58 ` [Buildroot] [PATCH v2 10/11] package/python-setuptools: bump to version 58.2.0 and split python2 version Adam Duskett @ 2021-10-25 19:22 ` Arnout Vandecappelle 0 siblings, 0 replies; 22+ messages in thread From: Arnout Vandecappelle @ 2021-10-25 19:22 UTC (permalink / raw) To: Adam Duskett, buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt On 15/10/2021 00:58, Adam Duskett wrote: > Python setuptools 44.0 is not compatible with python 3.10. Unfortunately, > python-setuptools 58.2.0 is not compatible with python2. As Buildroot is not > ready to end supporting python2, the python-setuptools package must accommodate > both the old version for python2 and the new version for python3.10. > > Changes include: > - Add two new directories: package/python-setuptools/44.0.0 and > package/python-setuptools/58.2.0 > - Add the appropriate patch and hash files to each directory. > - Modify python-setuptools.mk to support both setuptools 44.0 and 58.2.0 > (setuptools 58.2.0 does not have a .zip on pypi anymore, only a tar.gz) > - Point the symlinks in package/python3-setuptools to the files in > package/python-setuptools/58.2.0/ > > Signed-off-by: Adam Duskett <aduskett@gmail.com> > --- > .../{ => 44.0.0}/0001-add-executable.patch | 0 > .../{ => 44.0.0}/python-setuptools.hash | 0 > .../58.2.0/0001-add-executable.patch | 72 +++++++++++++++++++ > .../58.2.0/python-setuptools.hash | 4 ++ > .../python-setuptools/python-setuptools.mk | 13 +++- > .../0001-add-executable.patch | 2 +- > .../python3-setuptools.hash | 2 +- > .../python3-setuptools/python3-setuptools.mk | 14 ++-- > 8 files changed, 93 insertions(+), 14 deletions(-) > rename package/python-setuptools/{ => 44.0.0}/0001-add-executable.patch (100%) > rename package/python-setuptools/{ => 44.0.0}/python-setuptools.hash (100%) > create mode 100644 package/python-setuptools/58.2.0/0001-add-executable.patch > create mode 100644 package/python-setuptools/58.2.0/python-setuptools.hash > > diff --git a/package/python-setuptools/0001-add-executable.patch b/package/python-setuptools/44.0.0/0001-add-executable.patch > similarity index 100% > rename from package/python-setuptools/0001-add-executable.patch > rename to package/python-setuptools/44.0.0/0001-add-executable.patch > diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/44.0.0/python-setuptools.hash > similarity index 100% > rename from package/python-setuptools/python-setuptools.hash > rename to package/python-setuptools/44.0.0/python-setuptools.hash > diff --git a/package/python-setuptools/58.2.0/0001-add-executable.patch b/package/python-setuptools/58.2.0/0001-add-executable.patch > new file mode 100644 > index 0000000000..23180eb3ec > --- /dev/null > +++ b/package/python-setuptools/58.2.0/0001-add-executable.patch > @@ -0,0 +1,72 @@ > +From 9b3d307f8f6a1af88f3f810f5a6cf0835830e1e8 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> > +Date: Mon, 7 Dec 2015 01:14:33 +0100 > +Subject: [PATCH 1/1] add executable Please run check-package. Regards, Arnout _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH v2 11/11] package/python3: bump to version 3.10 2021-10-14 22:58 [Buildroot] [PATCH v2 00/11] package/python3: bump to version 3.10 Adam Duskett ` (9 preceding siblings ...) 2021-10-14 22:58 ` [Buildroot] [PATCH v2 10/11] package/python-setuptools: bump to version 58.2.0 and split python2 version Adam Duskett @ 2021-10-14 22:58 ` Adam Duskett 10 siblings, 0 replies; 22+ messages in thread From: Adam Duskett @ 2021-10-14 22:58 UTC (permalink / raw) To: buildroot Cc: Jugurtha BELKALEM, Samuel Martin, Asaf Kahlon, Julien Olivain, Thomas Petazzoni, Oli Vogt, Adam Duskett - Remove 0013-Add-an-option-to-disable-installation-of-test-module.patch as it is now upstreamed. - Refactor and rename all other patches as necessary. Signed-off-by: Adam Duskett <aduskett@gmail.com> --- ...e-the-build-of-pyc-files-conditional.patch | 6 +- ...taddrinfo-configure-test-when-cross-.patch | 2 +- ...re-to-disable-the-build-of-certain-e.patch | 16 +-- ...y-header-paths-for-cross-compilation.patch | 52 ++++---- ...ook-in-usr-lib-termcap-for-libraries.patch | 4 +- .../0006-Don-t-add-multiarch-paths.patch | 2 +- .../0007-Abort-on-failed-module-build.patch | 2 +- ...locale-and-set-to-default-when-addin.patch | 2 +- ...Add-importlib-fix-for-PEP-3147-issue.patch | 6 +- ...-disable-installation-of-test-module.patch | 117 ------------------ ...0013-Add-an-option-to-disable-pydoc.patch} | 49 ++++---- ...14-Add-an-option-to-disable-lib2to3.patch} | 83 +++++++------ ...ption-to-disable-the-sqlite3-module.patch} | 46 +++---- ...-an-option-to-disable-the-tk-module.patch} | 61 ++++----- ...option-to-disable-the-curses-module.patch} | 37 +++--- ...0018-Add-an-option-to-disable-expat.patch} | 43 +++---- ...Add-an-option-to-disable-CJK-codecs.patch} | 2 +- ...> 0020-Add-an-option-to-disable-NIS.patch} | 2 +- ...dd-an-option-to-disable-unicodedata.patch} | 2 +- ... 0022-Add-an-option-to-disable-IDLE.patch} | 51 ++++---- ...23-Add-an-option-to-disable-decimal.patch} | 6 +- ...n-to-disable-the-ossaudiodev-module.patch} | 2 +- ...n-option-to-disable-openssl-support.patch} | 6 +- ...tion-to-disable-the-readline-module.patch} | 6 +- ...o-disable-zlib-bzip2-and-xz-modules.patch} | 6 +- ...hon-config.sh-don-t-reassign-prefix.patch} | 4 +- ...Fix-cross-compiling-the-uuid-module.patch} | 2 +- ...dd-an-option-to-disable-uuid-module.patch} | 6 +- ...fix-building-on-older-distributions.patch} | 0 ...p-CC-print-multiarch-output-for-mus.patch} | 2 +- ...on-to-disable-the-berkeleydb-module.patch} | 6 +- ...ng-doesn-t-set-errno-when-encryptio.patch} | 0 ...eration-error-in-_ExecutorManagerTh.patch} | 0 package/python3/python3.hash | 8 +- package/python3/python3.mk | 4 +- 35 files changed, 270 insertions(+), 373 deletions(-) delete mode 100644 package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch rename package/python3/{0014-Add-an-option-to-disable-pydoc.patch => 0013-Add-an-option-to-disable-pydoc.patch} (74%) rename package/python3/{0015-Add-an-option-to-disable-lib2to3.patch => 0014-Add-an-option-to-disable-lib2to3.patch} (67%) rename package/python3/{0016-Add-option-to-disable-the-sqlite3-module.patch => 0015-Add-option-to-disable-the-sqlite3-module.patch} (63%) rename package/python3/{0017-Add-an-option-to-disable-the-tk-module.patch => 0016-Add-an-option-to-disable-the-tk-module.patch} (52%) rename package/python3/{0018-Add-an-option-to-disable-the-curses-module.patch => 0017-Add-an-option-to-disable-the-curses-module.patch} (64%) rename package/python3/{0019-Add-an-option-to-disable-expat.patch => 0018-Add-an-option-to-disable-expat.patch} (76%) rename package/python3/{0020-Add-an-option-to-disable-CJK-codecs.patch => 0019-Add-an-option-to-disable-CJK-codecs.patch} (94%) rename package/python3/{0021-Add-an-option-to-disable-NIS.patch => 0020-Add-an-option-to-disable-NIS.patch} (95%) rename package/python3/{0022-Add-an-option-to-disable-unicodedata.patch => 0021-Add-an-option-to-disable-unicodedata.patch} (95%) rename package/python3/{0023-Add-an-option-to-disable-IDLE.patch => 0022-Add-an-option-to-disable-IDLE.patch} (69%) rename package/python3/{0024-Add-an-option-to-disable-decimal.patch => 0023-Add-an-option-to-disable-decimal.patch} (95%) rename package/python3/{0025-Add-an-option-to-disable-the-ossaudiodev-module.patch => 0024-Add-an-option-to-disable-the-ossaudiodev-module.patch} (97%) rename package/python3/{0026-Add-an-option-to-disable-openssl-support.patch => 0025-Add-an-option-to-disable-openssl-support.patch} (89%) rename package/python3/{0027-Add-an-option-to-disable-the-readline-module.patch => 0026-Add-an-option-to-disable-the-readline-module.patch} (90%) rename package/python3/{0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch => 0027-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch} (92%) rename package/python3/{0029-python-config.sh-don-t-reassign-prefix.patch => 0028-python-config.sh-don-t-reassign-prefix.patch} (97%) rename package/python3/{0030-Fix-cross-compiling-the-uuid-module.patch => 0029-Fix-cross-compiling-the-uuid-module.patch} (96%) rename package/python3/{0031-Add-an-option-to-disable-uuid-module.patch => 0030-Add-an-option-to-disable-uuid-module.patch} (88%) rename package/python3/{0032-fix-building-on-older-distributions.patch => 0031-fix-building-on-older-distributions.patch} (100%) rename package/python3/{0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch => 0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch} (98%) rename package/python3/{0034-Add-an-option-to-disable-the-berkeleydb-module.patch => 0033-Add-an-option-to-disable-the-berkeleydb-module.patch} (88%) rename package/python3/{0035-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch => 0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch} (100%) rename package/python3/{0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch => 0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch} (100%) diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch index 44902725d7..a661ef6435 100644 --- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -18,7 +18,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in index 77f91e72b1..0c809f3d8a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1550,6 +1550,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1601,6 +1601,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -26,7 +26,7 @@ index 77f91e72b1..0c809f3d8a 100644 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST) -f \ -@@ -1577,6 +1578,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -1628,6 +1629,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages @@ -38,7 +38,7 @@ diff --git a/configure.ac b/configure.ac index d60f05251a..1ee5a09588 100644 --- a/configure.ac +++ b/configure.ac -@@ -1121,6 +1121,12 @@ fi +@@ -1108,6 +1108,12 @@ fi AC_MSG_CHECKING(LDLIBRARY) diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch index 00177814cc..e2e5970237 100644 --- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch @@ -13,7 +13,7 @@ diff --git a/configure.ac b/configure.ac index 1ee5a09588..c2445edc88 100644 --- a/configure.ac +++ b/configure.ac -@@ -4210,7 +4210,7 @@ fi +@@ -4208,7 +4208,7 @@ fi AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch index 7cccc588e9..12dd85d80e 100644 --- a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch +++ b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch @@ -47,7 +47,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in index 0c809f3d8a..7c3dde8dd4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -216,6 +216,8 @@ FILEMODE= 644 +@@ -219,6 +219,8 @@ FILEMODE= 644 # configure script arguments CONFIG_ARGS= @CONFIG_ARGS@ @@ -56,7 +56,7 @@ index 0c809f3d8a..7c3dde8dd4 100644 # Subdirectories with code SRCDIRS= @SRCDIRS@ -@@ -632,6 +634,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o +@@ -629,6 +631,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o esac; \ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ @@ -64,7 +64,7 @@ index 0c809f3d8a..7c3dde8dd4 100644 $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -@@ -1696,7 +1699,8 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1749,7 +1752,8 @@ libainstall: @DEF_MAKE_RULE@ python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -78,7 +78,7 @@ diff --git a/configure.ac b/configure.ac index c2445edc88..73d66167de 100644 --- a/configure.ac +++ b/configure.ac -@@ -3081,6 +3081,8 @@ LIBS="$withval $LIBS" +@@ -3069,6 +3069,8 @@ LIBS="$withval $LIBS" PKG_PROG_PKG_CONFIG @@ -91,8 +91,8 @@ diff --git a/setup.py b/setup.py index 770866bca7..b6c829b3a5 100644 --- a/setup.py +++ b/setup.py -@@ -44,7 +44,10 @@ from distutils.spawn import find_executable - TEST_EXTENSIONS = True +@@ -58,7 +58,10 @@ with warnings.catch_warnings(): + TEST_EXTENSIONS = (sysconfig.get_config_var('TEST_MODULES') == 'yes') # This global variable is used to hold the list of modules to be disabled. -DISABLED_MODULE_LIST = [] @@ -101,8 +101,8 @@ index 770866bca7..b6c829b3a5 100644 +except KeyError: + DISABLED_MODULE_LIST = list() - - def get_platform(): + # --list-module-names option used by Tools/scripts/generate_module_names.py + LIST_MODULE_NAMES = False -- 2.25.1 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 index 24f369f87f..0311348405 100644 --- a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch +++ b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch @@ -15,13 +15,15 @@ values, and get correct header/library paths when cross-compiling third-party Python modules. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Adam Duskett <aduskett@gmail.com> +Refresh for 3.10.0 --- Lib/distutils/command/build_ext.py | 5 ++++- - Lib/distutils/sysconfig.py | 15 +++++++++++---- + 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 1a9bd1200f..3cf7d6746e 100644 +index 1a9bd12..3cf7d67 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -234,7 +234,10 @@ class build_ext(Command): @@ -36,32 +38,32 @@ index 1a9bd1200f..3cf7d6746e 100644 else: # building python standard extensions self.library_dirs.append('.') -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 37feae5df7..e9c3a27856 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -17,10 +17,17 @@ import sys - from .errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. --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) +diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py +index 95b48f6..9fb1956 100644 +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -123,10 +123,17 @@ _SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include', + _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 ++ _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) ++ _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 - # Path to the base directory of the project. On Windows the binary may - # live in project/PCbuild/win32 or project/PCbuild/amd64. -- -2.25.1 +2.30.2 diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch index c5abcfd786..3134923d28 100644 --- a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index b6c829b3a5..ec3ba60607 100644 +index 66d372a..e632b6f 100644 --- a/setup.py +++ b/setup.py -@@ -1041,12 +1041,9 @@ class PyBuildExt(build_ext): +@@ -1133,12 +1133,9 @@ class PyBuildExt(build_ext): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0006-Don-t-add-multiarch-paths.patch index bb861612b1..a770b022b1 100644 --- a/package/python3/0006-Don-t-add-multiarch-paths.patch +++ b/package/python3/0006-Don-t-add-multiarch-paths.patch @@ -20,7 +20,7 @@ diff --git a/setup.py b/setup.py index ec3ba60607..e27620035c 100644 --- a/setup.py +++ b/setup.py -@@ -734,10 +734,10 @@ class PyBuildExt(build_ext): +@@ -816,10 +816,10 @@ class PyBuildExt(build_ext): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0007-Abort-on-failed-module-build.patch index 856fcaac21..4a688c9748 100644 --- a/package/python3/0007-Abort-on-failed-module-build.patch +++ b/package/python3/0007-Abort-on-failed-module-build.patch @@ -17,7 +17,7 @@ diff --git a/setup.py b/setup.py index e27620035c..d3f0e663f2 100644 --- a/setup.py +++ b/setup.py -@@ -524,6 +524,7 @@ class PyBuildExt(build_ext): +@@ -556,6 +556,7 @@ class PyBuildExt(build_ext): print("Failed to build these modules:") print_three_column(failed) print() diff --git a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch index 8b0d4f4c4d..d34870784d 100644 --- a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch +++ b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch @@ -25,7 +25,7 @@ diff --git a/setup.py b/setup.py index d3f0e663f2..926c16f58f 100644 --- a/setup.py +++ b/setup.py -@@ -680,7 +680,7 @@ class PyBuildExt(build_ext): +@@ -759,7 +759,7 @@ class PyBuildExt(build_ext): tmpfile = os.path.join(self.build_temp, 'ccpaths') if not os.path.exists(self.build_temp): os.makedirs(self.build_temp) diff --git a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch index 7a885303cb..b18f94ab4e 100644 --- a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch +++ b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch @@ -28,7 +28,7 @@ diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_ext index 25a3f8c0e0..2cb9a9aa52 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py -@@ -373,8 +373,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): +@@ -392,8 +392,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): a True value is the same as setting 'optimization' to the empty string while a False value is equivalent to setting 'optimization' to '1'. @@ -37,7 +37,7 @@ index 25a3f8c0e0..2cb9a9aa52 100644 """ if debug_override is not None: _warnings.warn('the debug_override parameter is deprecated; use ' -@@ -386,10 +384,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): +@@ -405,10 +403,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): path = _os.fspath(path) head, tail = _path_split(path) base, sep, rest = tail.rpartition('.') @@ -49,7 +49,7 @@ index 25a3f8c0e0..2cb9a9aa52 100644 if optimization is None: if sys.flags.optimize == 0: optimization = '' -@@ -426,46 +421,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): +@@ -445,46 +440,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): head.lstrip(path_separators), filename, ) diff --git a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch deleted file mode 100644 index 8c1b989361..0000000000 --- a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 0337342d413d13f437fd089de91faee70a8bf3f9 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Date: Wed, 22 Feb 2017 17:01:18 -0800 -Subject: [PATCH] Add an option to disable installation of test modules - -The Python standard distribution comes with many test modules, that -are not necessarly useful on embedded targets. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Signed-off-by: Samuel Martin <s.martin49@gmail.com> -[ Andrey Smirnov: ported to Python 3.6 ] -Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> -[james.hilliard1@gmail.com: adapt to python 3.9] -Signed-off-by: James Hilliard <james.hilliard1@gmail.com> ---- - Makefile.pre.in | 56 ++++++++++++++++++++++++++++++++----------------- - configure.ac | 5 +++++ - 2 files changed, 42 insertions(+), 19 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7c3dde8dd4..204f293d53 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1406,8 +1406,29 @@ maninstall: altmaninstall - - # Install the library - XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax --LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ -- tkinter/test/test_ttk site-packages test \ -+ -+LIBSUBDIRS= tkinter site-packages \ -+ asyncio \ -+ collections concurrent concurrent/futures encodings \ -+ email email/mime \ -+ ensurepip ensurepip/_bundled \ -+ html json http dbm xmlrpc \ -+ sqlite3 \ -+ logging csv wsgiref urllib \ -+ lib2to3 lib2to3/fixes lib2to3/pgen2 \ -+ ctypes ctypes/macholib \ -+ idlelib idlelib/Icons \ -+ distutils distutils/command $(XMLLIBSUBDIRS) \ -+ importlib \ -+ turtledemo \ -+ multiprocessing multiprocessing/dummy \ -+ unittest \ -+ venv venv/scripts venv/scripts/common venv/scripts/posix \ -+ curses pydoc_data \ -+ zoneinfo -+ -+TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -+ tkinter/test/test_ttk test \ - test/audiodata \ - test/capath test/data \ - test/cjkencodings test/decimaltestdata \ -@@ -1468,28 +1489,25 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ - test/test_importlib/zipdata02 \ - test/test_zoneinfo test/test_zoneinfo/data \ - test/ziptestdata \ -- asyncio \ - test/test_asyncio \ -- collections concurrent concurrent/futures encodings \ -- email email/mime test/test_email test/test_email/data \ -- ensurepip ensurepip/_bundled \ -- html json test/test_json http dbm xmlrpc \ -- sqlite3 sqlite3/test \ -- logging csv wsgiref urllib \ -- lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \ -+ test/test_email test/test_email/data \ -+ test/test_json \ -+ sqlite3/test \ -+ lib2to3/tests \ - lib2to3/tests/data lib2to3/tests/data/fixers \ - lib2to3/tests/data/fixers/myfixes \ -- ctypes ctypes/test ctypes/macholib \ -- idlelib idlelib/Icons idlelib/idle_test \ -- distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \ -+ ctypes/test \ -+ idlelib/idle_test \ -+ distutils/tests \ - test/test_peg_generator \ -+ test/test_importlib test/test_importlib/builtin \ - test/test_tools test/test_warnings test/test_warnings/data \ -- turtledemo \ -- multiprocessing multiprocessing/dummy \ -- unittest unittest/test unittest/test/testmock \ -- venv venv/scripts venv/scripts/common venv/scripts/posix \ -- curses pydoc_data \ -- zoneinfo -+ unittest/test unittest/test/testmock -+ -+ifeq (@TEST_MODULES@,yes) -+LIBSUBDIRS += $(TESTSUBDIRS) -+endif -+ - libinstall: build_all $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index 73d66167de..92e28d02ee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3358,6 +3358,11 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_getcpuclockid) - fi - -+AC_SUBST(TEST_MODULES) -+ -+AC_ARG_ENABLE(test-modules, -+ AS_HELP_STRING([--disable-test-modules], [disable test modules]), -+ [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) - - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) --- -2.25.1 - diff --git a/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/package/python3/0013-Add-an-option-to-disable-pydoc.patch similarity index 74% rename from package/python3/0014-Add-an-option-to-disable-pydoc.patch rename to package/python3/0013-Add-an-option-to-disable-pydoc.patch index 0c928a0bb2..a540a3c9a2 100644 --- a/package/python3/0014-Add-an-option-to-disable-pydoc.patch +++ b/package/python3/0013-Add-an-option-to-disable-pydoc.patch @@ -10,17 +10,19 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com> [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> +[ Adam Duskett: ported to Python 3.10.0 ] +Signed-off-by: Adam Duskett <aduskett@gmail.com> --- - Makefile.pre.in | 8 +++++++- + Makefile.pre.in | 7 ++++++- configure.ac | 6 ++++++ setup.py | 9 +++++++-- - 3 files changed, 20 insertions(+), 3 deletions(-) + 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 204f293d53..63e3df0470 100644 +index c0d5511..32b3df7 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1374,7 +1374,9 @@ bininstall: altbininstall +@@ -1392,7 +1392,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(BINDIR)/idle3 (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -rm -f $(DESTDIR)$(BINDIR)/pydoc3 @@ -30,31 +32,30 @@ index 204f293d53..63e3df0470 100644 -rm -f $(DESTDIR)$(BINDIR)/2to3 (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -@@ -1424,7 +1426,7 @@ LIBSUBDIRS= tkinter site-packages \ +@@ -1443,7 +1445,6 @@ LIBSUBDIRS= asyncio \ + lib2to3 lib2to3/fixes lib2to3/pgen2 \ + logging \ multiprocessing multiprocessing/dummy \ - unittest \ - venv venv/scripts venv/scripts/common venv/scripts/posix \ -- curses pydoc_data \ -+ curses \ - zoneinfo - - TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -@@ -1508,6 +1510,10 @@ ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif +- pydoc_data \ + site-packages \ + sqlite3 \ + tkinter \ +@@ -1531,6 +1532,10 @@ TESTSUBDIRS= ctypes/test \ + tkinter/test/test_ttk \ + unittest/test unittest/test/testmock +ifeq (@PYDOC@,yes) +LIBSUBDIRS += pydoc_data +endif + + TEST_MODULES=@TEST_MODULES@ libinstall: build_all $(srcdir)/Modules/xxmodule.c @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ diff --git a/configure.ac b/configure.ac -index 92e28d02ee..174ed85a7c 100644 +index 083a12d..9079531 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,12 @@ if test "$posix_threads" = "yes"; then +@@ -3351,6 +3351,12 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -64,14 +65,14 @@ index 92e28d02ee..174ed85a7c 100644 + AS_HELP_STRING([--disable-pydoc], [disable pydoc]), + [ PYDOC="${enableval}" ], [ PYDOC=yes ]) + - AC_SUBST(TEST_MODULES) - AC_ARG_ENABLE(test-modules, + # Check for enable-ipv6 + AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 926c16f58f..1fc5fac90c 100644 +index d00d389..d23f148 100644 --- a/setup.py +++ b/setup.py -@@ -2565,6 +2565,12 @@ def main(): +@@ -2708,6 +2708,12 @@ def main(): # turn off warnings when deprecated modules are imported import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -84,7 +85,7 @@ index 926c16f58f..1fc5fac90c 100644 setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], -@@ -2589,8 +2595,7 @@ def main(): +@@ -2733,8 +2739,7 @@ def main(): # If you change the scripts installed here, you also need to # check the PyBuildScripts command above, and change the links # created by the bininstall target in Makefile.pre.in @@ -95,5 +96,5 @@ index 926c16f58f..1fc5fac90c 100644 # --install-platlib -- -2.25.1 +2.30.2 diff --git a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/package/python3/0014-Add-an-option-to-disable-lib2to3.patch similarity index 67% rename from package/python3/0015-Add-an-option-to-disable-lib2to3.patch rename to package/python3/0014-Add-an-option-to-disable-lib2to3.patch index fe94cdfded..f150dabc27 100644 --- a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0014-Add-an-option-to-disable-lib2to3.patch @@ -10,17 +10,19 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com> [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> +[ Adam Duskett: ported to Python 3.10.0 ] +Signed-off-by: Adam Duskett <aduskett@gmail.com> --- - Makefile.pre.in | 16 ++++++++++++---- - configure.ac | 6 ++++++ - setup.py | 5 +++-- - 3 files changed, 21 insertions(+), 6 deletions(-) + Makefile.pre.in | 17 ++++++++++++----- + configure.ac | 5 +++++ + setup.py | 6 +++--- + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 63e3df0470..8b7de12999 100644 +index 28cf88e..63fa9fb 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1378,7 +1378,9 @@ ifeq (@PYDOC@,yes) +@@ -1396,7 +1396,9 @@ ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) endif -rm -f $(DESTDIR)$(BINDIR)/2to3 @@ -30,27 +32,28 @@ index 63e3df0470..8b7de12999 100644 if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ -@@ -1417,7 +1419,6 @@ LIBSUBDIRS= tkinter site-packages \ - html json http dbm xmlrpc \ - sqlite3 \ - logging csv wsgiref urllib \ -- lib2to3 lib2to3/fixes lib2to3/pgen2 \ - ctypes ctypes/macholib \ +@@ -1442,7 +1444,6 @@ LIBSUBDIRS= asyncio \ idlelib idlelib/Icons \ - distutils distutils/command $(XMLLIBSUBDIRS) \ -@@ -1495,9 +1496,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - test/test_email test/test_email/data \ - test/test_json \ - sqlite3/test \ + importlib importlib/metadata \ + json \ +- lib2to3 lib2to3/fixes lib2to3/pgen2 \ + logging \ + multiprocessing multiprocessing/dummy \ + site-packages \ +@@ -1459,10 +1460,6 @@ LIBSUBDIRS= asyncio \ + TESTSUBDIRS= ctypes/test \ + distutils/tests \ + idlelib/idle_test \ - lib2to3/tests \ -- lib2to3/tests/data lib2to3/tests/data/fixers \ +- lib2to3/tests/data \ +- lib2to3/tests/data/fixers \ - lib2to3/tests/data/fixers/myfixes \ - ctypes/test \ - idlelib/idle_test \ - distutils/tests \ -@@ -1506,6 +1504,14 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - test/test_tools test/test_warnings test/test_warnings/data \ - unittest/test unittest/test/testmock + sqlite3/test \ + test test/audiodata \ + test/capath test/cjkencodings \ +@@ -1536,6 +1533,14 @@ ifeq (@PYDOC@,yes) + LIBSUBDIRS += pydoc_data + endif +ifeq (@LIB2TO3@,yes) +LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 @@ -60,10 +63,10 @@ index 63e3df0470..8b7de12999 100644 + lib2to3/tests/data/fixers/myfixes +endif + - ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif -@@ -1606,10 +1612,12 @@ ifeq (@PYC_BUILD@,yes) + TEST_MODULES=@TEST_MODULES@ + libinstall: build_all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ +@@ -1638,10 +1643,12 @@ ifeq (@PYC_BUILD@,yes) -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages endif @@ -77,27 +80,26 @@ index 63e3df0470..8b7de12999 100644 # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. diff --git a/configure.ac b/configure.ac -index 174ed85a7c..f1f5e9a7b0 100644 +index 9079531..34c2ba9 100644 --- a/configure.ac +++ b/configure.ac -@@ -3370,6 +3370,12 @@ AC_ARG_ENABLE(test-modules, - AS_HELP_STRING([--disable-test-modules], [disable test modules]), - [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) +@@ -5950,6 +5950,11 @@ else + fi + AC_SUBST(TEST_MODULES) +AC_SUBST(LIB2TO3) + +AC_ARG_ENABLE(lib2to3, + AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), + [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) -+ - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) + + # generate output files + AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) diff --git a/setup.py b/setup.py -index 1fc5fac90c..4063d7ffa5 100644 +index d23f148..663fd44 100644 --- a/setup.py +++ b/setup.py -@@ -2566,10 +2566,11 @@ def main(): +@@ -2709,11 +2709,11 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -106,11 +108,12 @@ index 1fc5fac90c..4063d7ffa5 100644 + scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): scripts += [ 'Tools/scripts/pydoc3' ] +- + if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/2to3' ] - setup(# PyPI Metadata (PEP 301) name = "Python", + version = sys.version.split()[0], -- -2.25.1 +2.30.2 diff --git a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0015-Add-option-to-disable-the-sqlite3-module.patch similarity index 63% rename from package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch rename to package/python3/0015-Add-option-to-disable-the-sqlite3-module.patch index d6c9bccd45..68aac7bfae 100644 --- a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch +++ b/package/python3/0015-Add-option-to-disable-the-sqlite3-module.patch @@ -7,32 +7,34 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com> [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> +[ Adam Duskett: ported to Python 3.10.0 ] +Signed-off-by: Adam Duskett <aduskett@gmail.com> --- Makefile.pre.in | 7 +++++-- configure.ac | 9 +++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8b7de12999..d826d8ac4b 100644 +index 5847029..5628860 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1417,7 +1417,6 @@ LIBSUBDIRS= tkinter site-packages \ - email email/mime \ - ensurepip ensurepip/_bundled \ - html json http dbm xmlrpc \ +@@ -1447,7 +1447,6 @@ LIBSUBDIRS= asyncio \ + logging \ + multiprocessing multiprocessing/dummy \ + site-packages \ - sqlite3 \ - logging csv wsgiref urllib \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ -@@ -1495,7 +1494,6 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - test/test_asyncio \ - test/test_email test/test_email/data \ - test/test_json \ -- sqlite3/test \ - ctypes/test \ - idlelib/idle_test \ + tkinter \ + turtledemo \ + unittest \ +@@ -1460,7 +1459,6 @@ LIBSUBDIRS= asyncio \ + TESTSUBDIRS= ctypes/test \ distutils/tests \ -@@ -1512,6 +1510,11 @@ TESTSUBDIRS += lib2to3/tests \ + idlelib/idle_test \ +- sqlite3/test \ + test test/audiodata \ + test/capath test/cjkencodings \ + test/data test/decimaltestdata \ +@@ -1541,6 +1539,11 @@ TESTSUBDIRS += lib2to3/tests \ lib2to3/tests/data/fixers/myfixes endif @@ -41,14 +43,14 @@ index 8b7de12999..d826d8ac4b 100644 +TESTSUBDIRS += sqlite3/test +endif + - ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif + TEST_MODULES=@TEST_MODULES@ + libinstall: build_all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index f1f5e9a7b0..8b5c65974c 100644 +index 34c2ba9..dfee472 100644 --- a/configure.ac +++ b/configure.ac -@@ -3358,6 +3358,15 @@ if test "$posix_threads" = "yes"; then +@@ -3351,6 +3351,15 @@ if test "$posix_threads" = "yes"; then AC_CHECK_FUNCS(pthread_getcpuclockid) fi @@ -65,5 +67,5 @@ index f1f5e9a7b0..8b5c65974c 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.30.2 diff --git a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0016-Add-an-option-to-disable-the-tk-module.patch similarity index 52% rename from package/python3/0017-Add-an-option-to-disable-the-tk-module.patch rename to package/python3/0016-Add-an-option-to-disable-the-tk-module.patch index b798eb56a5..e675edc18b 100644 --- a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0016-Add-an-option-to-disable-the-tk-module.patch @@ -7,52 +7,53 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com> [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> +[ Adam Duskett: ported to Python 3.10.0 ] +Signed-off-by: Adam Duskett <aduskett@gmail.com> --- - Makefile.pre.in | 11 ++++++++--- + Makefile.pre.in | 10 +++++++--- configure.ac | 9 +++++++++ - 2 files changed, 17 insertions(+), 3 deletions(-) + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index d826d8ac4b..dc84384680 100644 +index 5628860..c968113 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1411,7 +1411,7 @@ maninstall: altmaninstall - # Install the library - XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax - --LIBSUBDIRS= tkinter site-packages \ -+LIBSUBDIRS= site-packages \ - asyncio \ - collections concurrent concurrent/futures encodings \ - email email/mime \ -@@ -1429,8 +1429,7 @@ LIBSUBDIRS= tkinter site-packages \ - curses \ - zoneinfo - --TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ -- tkinter/test/test_ttk test \ -+TESTSUBDIRS= test \ - test/audiodata \ - test/capath test/data \ - test/cjkencodings test/decimaltestdata \ -@@ -1502,6 +1501,12 @@ TESTSUBDIRS= tkinter/test tkinter/test/test_tkinter \ - test/test_tools test/test_warnings test/test_warnings/data \ +@@ -1447,7 +1447,6 @@ LIBSUBDIRS= asyncio \ + logging \ + multiprocessing multiprocessing/dummy \ + site-packages \ +- tkinter \ + turtledemo \ + unittest \ + urllib \ +@@ -1523,8 +1522,6 @@ TESTSUBDIRS= ctypes/test \ + test/tracedmodules \ + test/xmltestdata test/xmltestdata/c14n-20 \ + test/ziptestdata \ +- tkinter/test tkinter/test/test_tkinter \ +- tkinter/test/test_ttk \ unittest/test unittest/test/testmock + ifeq (@PYDOC@,yes) +@@ -1544,6 +1541,13 @@ LIBSUBDIRS += sqlite3 + TESTSUBDIRS += sqlite3/test + endif + +ifeq (@TK@,yes) +LIBSUBDIRS += tkinter +TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ + tkinter/test/test_ttk +endif + - ifeq (@LIB2TO3@,yes) - LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 - TESTSUBDIRS += lib2to3/tests \ ++ + TEST_MODULES=@TEST_MODULES@ + libinstall: build_all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index 8b5c65974c..4c72dae960 100644 +index dfee472..dc76dff 100644 --- a/configure.ac +++ b/configure.ac -@@ -3367,6 +3367,15 @@ if test "$SQLITE3" = "no" ; then +@@ -3360,6 +3360,15 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi @@ -69,5 +70,5 @@ index 8b5c65974c..4c72dae960 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.30.2 diff --git a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0017-Add-an-option-to-disable-the-curses-module.patch similarity index 64% rename from package/python3/0018-Add-an-option-to-disable-the-curses-module.patch rename to package/python3/0017-Add-an-option-to-disable-the-curses-module.patch index 93dfac26ec..43dbf1f010 100644 --- a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch +++ b/package/python3/0017-Add-an-option-to-disable-the-curses-module.patch @@ -7,39 +7,40 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com> [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> +[ Adam Duskett: ported to Python 3.10.0 ] +Signed-off-by: Adam Duskett <aduskett@gmail.com> --- - Makefile.pre.in | 5 ++++- + Makefile.pre.in | 4 +++- configure.ac | 9 +++++++++ - 2 files changed, 13 insertions(+), 1 deletion(-) + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index dc84384680..2a82f3308f 100644 +index c968113..f89f155 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1426,7 +1426,6 @@ LIBSUBDIRS= site-packages \ - multiprocessing multiprocessing/dummy \ - unittest \ - venv venv/scripts venv/scripts/common venv/scripts/posix \ +@@ -1433,7 +1433,6 @@ LIBSUBDIRS= asyncio \ + concurrent concurrent/futures \ + csv \ + ctypes ctypes/macholib \ - curses \ - zoneinfo - - TESTSUBDIRS= test \ -@@ -1507,6 +1506,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ + dbm \ + distutils distutils/command \ + email email/mime \ +@@ -1547,6 +1546,9 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ tkinter/test/test_ttk endif +ifeq (@CURSES@,yes) +LIBSUBDIRS += curses +endif -+ - ifeq (@LIB2TO3@,yes) - LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 - TESTSUBDIRS += lib2to3/tests \ + + TEST_MODULES=@TEST_MODULES@ + libinstall: build_all $(srcdir)/Modules/xxmodule.c diff --git a/configure.ac b/configure.ac -index 4c72dae960..acd98381a3 100644 +index dc76dff..4f1cda5 100644 --- a/configure.ac +++ b/configure.ac -@@ -3376,6 +3376,15 @@ if test "$TK" = "no"; then +@@ -3369,6 +3369,15 @@ if test "$TK" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" fi @@ -56,5 +57,5 @@ index 4c72dae960..acd98381a3 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.30.2 diff --git a/package/python3/0019-Add-an-option-to-disable-expat.patch b/package/python3/0018-Add-an-option-to-disable-expat.patch similarity index 76% rename from package/python3/0019-Add-an-option-to-disable-expat.patch rename to package/python3/0018-Add-an-option-to-disable-expat.patch index e7349058c8..7adfe1a2ad 100644 --- a/package/python3/0019-Add-an-option-to-disable-expat.patch +++ b/package/python3/0018-Add-an-option-to-disable-expat.patch @@ -13,26 +13,27 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Samuel Martin <s.martin49@gmail.com> [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> +[ Adam Duskett: ported to Python 3.10.0 ] +Signed-off-by: Adam Duskett <aduskett@gmail.com> --- - Makefile.pre.in | 6 +++++- + Makefile.pre.in | 5 ++++- configure.ac | 18 +++++++++++++----- setup.py | 2 +- - 3 files changed, 19 insertions(+), 7 deletions(-) + 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2a82f3308f..e678c8817e 100644 +index f89f155..08c5e8a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1420,7 +1420,7 @@ LIBSUBDIRS= site-packages \ - logging csv wsgiref urllib \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ -- distutils distutils/command $(XMLLIBSUBDIRS) \ -+ distutils distutils/command \ - importlib \ - turtledemo \ - multiprocessing multiprocessing/dummy \ -@@ -1510,6 +1510,10 @@ ifeq (@CURSES@,yes) +@@ -1451,7 +1451,6 @@ LIBSUBDIRS= asyncio \ + urllib \ + venv venv/scripts venv/scripts/common venv/scripts/posix \ + wsgiref \ +- $(XMLLIBSUBDIRS) \ + xmlrpc \ + zoneinfo + TESTSUBDIRS= ctypes/test \ +@@ -1550,6 +1549,10 @@ ifeq (@CURSES@,yes) LIBSUBDIRS += curses endif @@ -40,14 +41,14 @@ index 2a82f3308f..e678c8817e 100644 +LIBSUBDIRS += $(XMLLIBSUBDIRS) +endif + - ifeq (@LIB2TO3@,yes) - LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 - TESTSUBDIRS += lib2to3/tests \ + TEST_MODULES=@TEST_MODULES@ + libinstall: build_all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index acd98381a3..9ef0ecd42f 100644 +index 4f1cda5..e99a174 100644 --- a/configure.ac +++ b/configure.ac -@@ -3084,13 +3084,21 @@ PKG_PROG_PKG_CONFIG +@@ -3072,13 +3072,21 @@ PKG_PROG_PKG_CONFIG AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library @@ -75,10 +76,10 @@ index acd98381a3..9ef0ecd42f 100644 # Check for use of the system libffi library AC_MSG_CHECKING(for --with-system-ffi) diff --git a/setup.py b/setup.py -index 4063d7ffa5..211a160f29 100644 +index 663fd44..e30ed52 100644 --- a/setup.py +++ b/setup.py -@@ -1666,7 +1666,7 @@ class PyBuildExt(build_ext): +@@ -1750,7 +1750,7 @@ class PyBuildExt(build_ext): # # More information on Expat can be found at www.libexpat.org. # @@ -88,5 +89,5 @@ index 4063d7ffa5..211a160f29 100644 define_macros = [] extra_compile_args = [] -- -2.25.1 +2.30.2 diff --git a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0019-Add-an-option-to-disable-CJK-codecs.patch similarity index 94% rename from package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch rename to package/python3/0019-Add-an-option-to-disable-CJK-codecs.patch index 4e22543096..9df8d58420 100644 --- a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch +++ b/package/python3/0019-Add-an-option-to-disable-CJK-codecs.patch @@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac index 9ef0ecd42f..18e6fd70a0 100644 --- a/configure.ac +++ b/configure.ac -@@ -3375,6 +3375,12 @@ if test "$SQLITE3" = "no" ; then +@@ -3368,6 +3368,12 @@ if test "$SQLITE3" = "no" ; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" fi diff --git a/package/python3/0021-Add-an-option-to-disable-NIS.patch b/package/python3/0020-Add-an-option-to-disable-NIS.patch similarity index 95% rename from package/python3/0021-Add-an-option-to-disable-NIS.patch rename to package/python3/0020-Add-an-option-to-disable-NIS.patch index 9cd54df180..3db145ed6e 100644 --- a/package/python3/0021-Add-an-option-to-disable-NIS.patch +++ b/package/python3/0020-Add-an-option-to-disable-NIS.patch @@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac index 18e6fd70a0..46d2a8131e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3381,6 +3381,12 @@ AC_ARG_ENABLE(codecs-cjk, +@@ -3374,6 +3374,12 @@ AC_ARG_ENABLE(codecs-cjk, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" fi]) diff --git a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/package/python3/0021-Add-an-option-to-disable-unicodedata.patch similarity index 95% rename from package/python3/0022-Add-an-option-to-disable-unicodedata.patch rename to package/python3/0021-Add-an-option-to-disable-unicodedata.patch index 2ddf606a70..95f9b30c23 100644 --- a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch +++ b/package/python3/0021-Add-an-option-to-disable-unicodedata.patch @@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac index 46d2a8131e..5844e3b73f 100644 --- a/configure.ac +++ b/configure.ac -@@ -3387,6 +3387,12 @@ AC_ARG_ENABLE(nis, +@@ -3380,6 +3380,12 @@ AC_ARG_ENABLE(nis, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" fi]) diff --git a/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/package/python3/0022-Add-an-option-to-disable-IDLE.patch similarity index 69% rename from package/python3/0023-Add-an-option-to-disable-IDLE.patch rename to package/python3/0022-Add-an-option-to-disable-IDLE.patch index 0e35eea699..e34f27969a 100644 --- a/package/python3/0023-Add-an-option-to-disable-IDLE.patch +++ b/package/python3/0022-Add-an-option-to-disable-IDLE.patch @@ -9,17 +9,19 @@ much sense to have it into our build. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> [ Andrey Smirnov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> +[ Adam Duskett: ported to Python 3.10.0 ] +Signed-off-by: Adam Duskett <aduskett@gmail.com> --- Makefile.pre.in | 7 ++++++- configure.ac | 6 ++++++ - setup.py | 4 +++- - 3 files changed, 15 insertions(+), 2 deletions(-) + setup.py | 5 ++++- + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e678c8817e..1148bd8708 100644 +index 08c5e8a..461c5e3 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1372,7 +1372,9 @@ bininstall: altbininstall +@@ -1390,7 +1390,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) -rm -f $(DESTDIR)$(BINDIR)/idle3 @@ -29,15 +31,15 @@ index e678c8817e..1148bd8708 100644 -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -1419,7 +1421,6 @@ LIBSUBDIRS= site-packages \ - html json http dbm xmlrpc \ - logging csv wsgiref urllib \ - ctypes ctypes/macholib \ +@@ -1440,7 +1442,6 @@ LIBSUBDIRS= asyncio \ + ensurepip ensurepip/_bundled \ + html \ + http \ - idlelib idlelib/Icons \ - distutils distutils/command \ - importlib \ - turtledemo \ -@@ -1514,6 +1515,10 @@ ifeq (@EXPAT@,yes) + importlib importlib/metadata \ + json \ + logging \ +@@ -1553,6 +1554,10 @@ ifeq (@EXPAT@,yes) LIBSUBDIRS += $(XMLLIBSUBDIRS) endif @@ -45,14 +47,14 @@ index e678c8817e..1148bd8708 100644 +LIBSUBDIRS += idlelib idlelib/Icons +endif + - ifeq (@LIB2TO3@,yes) - LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 - TESTSUBDIRS += lib2to3/tests \ + TEST_MODULES=@TEST_MODULES@ + libinstall: build_all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index 5844e3b73f..7bd4623ccd 100644 +index e99a174..baaa743 100644 --- a/configure.ac +++ b/configure.ac -@@ -3429,6 +3429,12 @@ AC_ARG_ENABLE(lib2to3, +@@ -6009,6 +6009,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) @@ -62,14 +64,14 @@ index 5844e3b73f..7bd4623ccd 100644 + AS_HELP_STRING([--disable-idle3], [disable idle3 IDE]), + [ IDLE="${enableval}" ], [ IDLE=yes ]) + - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) + # generate output files + AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) + AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) diff --git a/setup.py b/setup.py -index 211a160f29..c4ee989ba3 100644 +index e30ed52..4dff249 100644 --- a/setup.py +++ b/setup.py -@@ -2566,11 +2566,13 @@ def main(): +@@ -2709,11 +2709,14 @@ def main(): import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) @@ -81,9 +83,10 @@ index 211a160f29..c4ee989ba3 100644 scripts += [ 'Tools/scripts/2to3' ] + if not '--disable-idle3' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/idle3' ] - ++ setup(# PyPI Metadata (PEP 301) name = "Python", + version = sys.version.split()[0], -- -2.25.1 +2.30.2 diff --git a/package/python3/0024-Add-an-option-to-disable-decimal.patch b/package/python3/0023-Add-an-option-to-disable-decimal.patch similarity index 95% rename from package/python3/0024-Add-an-option-to-disable-decimal.patch rename to package/python3/0023-Add-an-option-to-disable-decimal.patch index b5a12f7f38..484f321c25 100644 --- a/package/python3/0024-Add-an-option-to-disable-decimal.patch +++ b/package/python3/0023-Add-an-option-to-disable-decimal.patch @@ -22,7 +22,7 @@ diff --git a/configure.ac b/configure.ac index 7bd4623ccd..e513ef6a20 100644 --- a/configure.ac +++ b/configure.ac -@@ -3135,13 +3135,20 @@ fi +@@ -3123,13 +3123,20 @@ fi AC_SUBST(LIBFFI_INCLUDEDIR) # Check for use of the system libmpdec library @@ -52,14 +52,14 @@ diff --git a/setup.py b/setup.py index c4ee989ba3..3d0c74bb7f 100644 --- a/setup.py +++ b/setup.py -@@ -2195,7 +2195,7 @@ class PyBuildExt(build_ext): +@@ -2308,7 +2308,7 @@ class PyBuildExt(build_ext): # Stefan Krah's _decimal module extra_compile_args = [] undef_macros = [] - if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"): + if '--with-libmpdec=system' in sysconfig.get_config_var("CONFIG_ARGS"): include_dirs = [] - libraries = [':libmpdec.so.2'] + libraries = ['mpdec'] sources = ['_decimal/_decimal.c'] -- 2.25.1 diff --git a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0024-Add-an-option-to-disable-the-ossaudiodev-module.patch similarity index 97% rename from package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch rename to package/python3/0024-Add-an-option-to-disable-the-ossaudiodev-module.patch index 0f68a08356..86bb5ea435 100644 --- a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ b/package/python3/0024-Add-an-option-to-disable-the-ossaudiodev-module.patch @@ -12,7 +12,7 @@ diff --git a/configure.ac b/configure.ac index e513ef6a20..c07505e89e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3165,6 +3165,12 @@ fi +@@ -3153,6 +3153,12 @@ fi AC_MSG_RESULT($with_decimal_contextvar) diff --git a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/package/python3/0025-Add-an-option-to-disable-openssl-support.patch similarity index 89% rename from package/python3/0026-Add-an-option-to-disable-openssl-support.patch rename to package/python3/0025-Add-an-option-to-disable-openssl-support.patch index 44d1d3d6b3..6e043030e6 100644 --- a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch +++ b/package/python3/0025-Add-an-option-to-disable-openssl-support.patch @@ -9,10 +9,10 @@ Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr> 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index c07505e89e..612e32faf5 100644 +index 08c148c..a81a24c 100644 --- a/configure.ac +++ b/configure.ac -@@ -3406,6 +3406,12 @@ AC_ARG_ENABLE(unicodedata, +@@ -3399,6 +3399,12 @@ AC_ARG_ENABLE(unicodedata, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" fi]) @@ -26,5 +26,5 @@ index c07505e89e..612e32faf5 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.30.2 diff --git a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0026-Add-an-option-to-disable-the-readline-module.patch similarity index 90% rename from package/python3/0027-Add-an-option-to-disable-the-readline-module.patch rename to package/python3/0026-Add-an-option-to-disable-the-readline-module.patch index 1597a2a560..f73f2feacf 100644 --- a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch +++ b/package/python3/0026-Add-an-option-to-disable-the-readline-module.patch @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 612e32faf5..2a6aaeff60 100644 +index a81a24c..41a21ff 100644 --- a/configure.ac +++ b/configure.ac -@@ -3412,6 +3412,12 @@ AC_ARG_ENABLE(openssl, +@@ -3405,6 +3405,12 @@ AC_ARG_ENABLE(openssl, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" fi]) @@ -26,5 +26,5 @@ index 612e32faf5..2a6aaeff60 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.30.2 diff --git a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0027-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch similarity index 92% rename from package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch rename to package/python3/0027-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch index a1d2ef3255..1197d18d7d 100644 --- a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch +++ b/package/python3/0027-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 1 file changed, 18 insertions(+) diff --git a/configure.ac b/configure.ac -index 2a6aaeff60..21479bbd7d 100644 +index 41a21ff..fa81bc7 100644 --- a/configure.ac +++ b/configure.ac -@@ -3418,6 +3418,24 @@ AC_ARG_ENABLE(readline, +@@ -3411,6 +3411,24 @@ AC_ARG_ENABLE(readline, DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" fi]) @@ -38,5 +38,5 @@ index 2a6aaeff60..21479bbd7d 100644 AC_ARG_ENABLE(tk, AS_HELP_STRING([--disable-tk], [disable tk]), -- -2.25.1 +2.30.2 diff --git a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0028-python-config.sh-don-t-reassign-prefix.patch similarity index 97% rename from package/python3/0029-python-config.sh-don-t-reassign-prefix.patch rename to package/python3/0028-python-config.sh-don-t-reassign-prefix.patch index 4478b40162..814a9d42e5 100644 --- a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch +++ b/package/python3/0028-python-config.sh-don-t-reassign-prefix.patch @@ -27,7 +27,7 @@ Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> 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 +index a1bc3cd..164d2d3 100644 --- a/Misc/python-config.sh.in +++ b/Misc/python-config.sh.in @@ -31,7 +31,7 @@ prefix_real=$(installed_prefix "$0") @@ -49,5 +49,5 @@ index a1bc3cd5f7..164d2d3603 100644 SO="@EXT_SUFFIX@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" -- -2.25.1 +2.30.2 diff --git a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/package/python3/0029-Fix-cross-compiling-the-uuid-module.patch similarity index 96% rename from package/python3/0030-Fix-cross-compiling-the-uuid-module.patch rename to package/python3/0029-Fix-cross-compiling-the-uuid-module.patch index 1bf5fc6db4..f5a3294dfc 100644 --- a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch +++ b/package/python3/0029-Fix-cross-compiling-the-uuid-module.patch @@ -23,7 +23,7 @@ diff --git a/setup.py b/setup.py index 3d0c74bb7f..c7be85f352 100644 --- a/setup.py +++ b/setup.py -@@ -1764,7 +1764,8 @@ class PyBuildExt(build_ext): +@@ -1850,7 +1850,8 @@ class PyBuildExt(build_ext): def detect_uuid(self): # Build the _uuid module if possible diff --git a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/package/python3/0030-Add-an-option-to-disable-uuid-module.patch similarity index 88% rename from package/python3/0031-Add-an-option-to-disable-uuid-module.patch rename to package/python3/0030-Add-an-option-to-disable-uuid-module.patch index 92b24b211d..ca83011084 100644 --- a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch +++ b/package/python3/0030-Add-an-option-to-disable-uuid-module.patch @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac -index 21479bbd7d..615c16aced 100644 +index fa81bc7..4e733f6 100644 --- a/configure.ac +++ b/configure.ac -@@ -3454,6 +3454,15 @@ if test "$CURSES" = "no"; then +@@ -3447,6 +3447,15 @@ if test "$CURSES" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" fi @@ -29,5 +29,5 @@ index 21479bbd7d..615c16aced 100644 AC_ARG_ENABLE(pydoc, -- -2.25.1 +2.30.2 diff --git a/package/python3/0032-fix-building-on-older-distributions.patch b/package/python3/0031-fix-building-on-older-distributions.patch similarity index 100% rename from package/python3/0032-fix-building-on-older-distributions.patch rename to package/python3/0031-fix-building-on-older-distributions.patch diff --git a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch similarity index 98% rename from package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch rename to package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index f70990b254..07d24fdeee 100644 --- a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ b/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -32,7 +32,7 @@ diff --git a/configure.ac b/configure.ac index 615c16aced..241298e6cf 100644 --- a/configure.ac +++ b/configure.ac -@@ -727,7 +727,9 @@ then +@@ -717,7 +717,9 @@ then fi diff --git a/package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch b/package/python3/0033-Add-an-option-to-disable-the-berkeleydb-module.patch similarity index 88% rename from package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch rename to package/python3/0033-Add-an-option-to-disable-the-berkeleydb-module.patch index a4e8baf4dd..8bd237d56e 100644 --- a/package/python3/0034-Add-an-option-to-disable-the-berkeleydb-module.patch +++ b/package/python3/0033-Add-an-option-to-disable-the-berkeleydb-module.patch @@ -9,10 +9,10 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac -index 72c1d86e82..8c3912d237 100644 +index 4e733f6..1e52f30 100644 --- a/configure.ac +++ b/configure.ac -@@ -3465,6 +3465,12 @@ if test "$UUID" = "no"; then +@@ -3458,6 +3458,12 @@ if test "$UUID" = "no"; then DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" fi @@ -26,5 +26,5 @@ index 72c1d86e82..8c3912d237 100644 AC_ARG_ENABLE(pydoc, -- -2.25.0 +2.30.2 diff --git a/package/python3/0035-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch similarity index 100% rename from package/python3/0035-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch rename to package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch diff --git a/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch b/package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch similarity index 100% rename from package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch rename to package/python3/0035-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 444dbd982a..cf7ef43238 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-397/ -md5 fddb060b483bc01850a3f412eea1d954 Python-3.9.7.tar.xz +# From https://www.python.org/downloads/release/python-310/ +md5 3e7035d272680f80e3ce4e8eb492d580 Python-3.10.0.tar.xz # Locally computed -sha256 f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57 Python-3.9.7.tar.xz -sha256 599826df92bfdcd2702eac691072498bb096c55af04ee984cf90f70ed77b5a70 LICENSE +sha256 5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002 Python-3.10.0.tar.xz +sha256 d0285b61e1a8e420c7deb95836738a5d4a0d26463138b17601f5971212684c4b LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 779f6dcb6c..381e22ae31 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON3_VERSION_MAJOR = 3.9 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).7 +PYTHON3_VERSION_MAJOR = 3.10 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).0 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others -- 2.30.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
end of thread, other threads:[~2021-12-29 23:14 UTC | newest] Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-10-14 22:58 [Buildroot] [PATCH v2 00/11] package/python3: bump to version 3.10 Adam Duskett 2021-10-14 22:58 ` [Buildroot] [PATCH v2 01/11] package/util-linux: bump to version 2.37.2 Adam Duskett 2021-10-16 16:51 ` Yann E. MORIN 2021-10-14 22:58 ` [Buildroot] [PATCH v2 02/11] package/python-pydantic: bump to version 1.8.2 Adam Duskett 2021-10-25 19:13 ` Arnout Vandecappelle 2021-10-14 22:58 ` [Buildroot] [PATCH v2 03/11] package/python-txtorcon: bump to version 21.1.0 Adam Duskett 2021-10-25 19:21 ` Arnout Vandecappelle 2021-10-14 22:58 ` [Buildroot] [PATCH v2 04/11] package/python-watchdog: bump to version 2.1.6 Adam Duskett 2021-10-25 19:14 ` Arnout Vandecappelle 2021-10-14 22:58 ` [Buildroot] [PATCH v2 05/11] package/python-certifi: add host variant Adam Duskett 2021-10-25 19:21 ` Arnout Vandecappelle 2021-10-14 22:58 ` [Buildroot] [PATCH v2 06/11] package/python-matplotlib: bump to version 3.4.3 Adam Duskett 2021-10-25 19:22 ` Arnout Vandecappelle 2021-10-14 22:58 ` [Buildroot] [PATCH v2 07/11] package/python-numpy: bump to version 1.21.2 Adam Duskett 2021-12-29 23:07 ` Thomas Petazzoni 2021-10-14 22:58 ` [Buildroot] [PATCH v2 08/11] package/python-pyalsa: add 0001-fix-pytuple-set-item-usage-no-return-value.patch Adam Duskett 2021-12-29 23:13 ` Thomas Petazzoni 2021-10-14 22:58 ` [Buildroot] [PATCH v2 09/11] package/python-django-enumfields: bump to version Adam Duskett 2021-12-29 23:14 ` Thomas Petazzoni 2021-10-14 22:58 ` [Buildroot] [PATCH v2 10/11] package/python-setuptools: bump to version 58.2.0 and split python2 version Adam Duskett 2021-10-25 19:22 ` Arnout Vandecappelle 2021-10-14 22:58 ` [Buildroot] [PATCH v2 11/11] package/python3: bump to version 3.10 Adam Duskett
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.