Skip to content

Commit ceae3d4

Browse files
th0ma7hgy59
th0ma7
and
hgy59
authored
Update pyton3 to 3.7.12 & python38 to 3.8.12, fix cffi build issues and update requirements.txt (#4902)
* python38: Update to 3.8.12 and fix cffi build issues * python38: Divide installation into sub-commands Otherwise there is this weird state where wheel is uninstalled but it tries to build cffi and fails bdist_wheel is not available (part of uninstalled wheel). * wheel.mk: Use --use-deprecated=legacy-resolver (#4851) * setuptools: Update to version 58.2.0 superseeding default 56.0.0 * gdbm: Disable static building and enable compatibility mode * python38: Include #4851 changes: LTO, gdbm, expat, etc. * python38: Enforce using sytem ffi * python3: Update requirements and sync with python38 * beets: Update beautifulsoup4 to version 4.10.0 * flexget: Update beautifulsoup4 to version 4.10.0 * fix build of homeassistant - remove poetry build dependency as it breaks the cross build environment (no idea why poetry was added in homeassistant 0.114.2-9) Co-authored-by: hgy59 <[email protected]> * native/python38: Force crossenv==1.0 as it breaks PyNaCl * greenlet: Update from version 1.1.1 to 1.1.2 * immutables: Update from version 0.15 to 0.16 * libffi: Update from version 3.3 to 3.4.2 * libsodium: Use latest version being -stable * java-11-openjdk: Update PLIST to reflect libffi update Co-authored-by: hgy59 <[email protected]>
1 parent 63c5ecf commit ceae3d4

36 files changed

+146
-120
lines changed

‎cross/gdbm/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,7 @@ LICENSE = GPLv2/LGPLv2
1313

1414
GNU_CONFIGURE = 1
1515

16+
CONFIGURE_ARGS = --disable-static
17+
CONFIGURE_ARGS += --enable-libgdbm-compat
18+
1619
include ../../mk/spksrc.cross-cc.mk

‎cross/greenlet/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = greenlet
2-
PKG_VERS = 1.1.1
2+
PKG_VERS = 1.1.2
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/g/${PKG_NAME}

‎cross/greenlet/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
greenlet-1.1.1.tar.gz SHA1 b4b03918da4bc5e50d3afc539151118e4a9e0550
2-
greenlet-1.1.1.tar.gz SHA256 c0f22774cd8294078bdf7392ac73cf00bfa1e5e0ed644bd064fdabc5f2a2f481
3-
greenlet-1.1.1.tar.gz MD5 a3fbf41851a6b5e1e823e8c18905877c
1+
greenlet-1.1.2.tar.gz SHA1 c602e132ae4aaed5cb2edd802b4f1014c06999bf
2+
greenlet-1.1.2.tar.gz SHA256 e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a
3+
greenlet-1.1.2.tar.gz MD5 f424fbd9afeed575dd2ba5f0ac66e30b

‎cross/immutables/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = immutables
2-
PKG_VERS = 0.15
2+
PKG_VERS = 0.16
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/i/$(PKG_NAME)

‎cross/immutables/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
immutables-0.15.tar.gz SHA1 7e9d1cc695e6f9f94d485fa00f510dbe327ff803
2-
immutables-0.15.tar.gz SHA256 3713ab1ebbb6946b7ce1387bb9d1d7f5e09c45add58c2a2ee65f963c171e746b
3-
immutables-0.15.tar.gz MD5 64628c8d813a4b3e954ef2af531eddc6
1+
immutables-0.16.tar.gz SHA1 229007da1039fe95de8448d0a94b5f2d474416c9
2+
immutables-0.16.tar.gz SHA256 d67e86859598eed0d926562da33325dac7767b7b1eff84e232c22abea19f4360
3+
immutables-0.16.tar.gz MD5 fd0706ba566d7aa84c5e8f3e34375dac

‎cross/java-11-openjdk/PLIST

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ lib:jvm/openjdk-11.0.12/lib/libawt_headless.so
195195
lib:jvm/openjdk-11.0.12/lib/libawt.so
196196
lib:jvm/openjdk-11.0.12/lib/libdt_socket.so
197197
lib:jvm/openjdk-11.0.12/lib/libextnet.so
198-
lib:jvm/openjdk-11.0.12/lib/libffi.so.7
198+
lib:jvm/openjdk-11.0.12/lib/libffi.so.8
199199
lib:jvm/openjdk-11.0.12/lib/libfontmanager.so
200200
lib:jvm/openjdk-11.0.12/lib/libharfbuzz.so
201201
lib:jvm/openjdk-11.0.12/lib/libinstrument.so

‎cross/libffi/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = libffi
2-
PKG_VERS = 3.3
2+
PKG_VERS = 3.4.2
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://github.com/libffi/$(PKG_NAME)/releases/download/v$(PKG_VERS)

‎cross/libffi/PLIST

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
lnk:lib/libffi.so
2-
lnk:lib/libffi.so.7
3-
lib:lib/libffi.so.7.1.0
2+
lnk:lib/libffi.so.8
3+
lib:lib/libffi.so.8.1.0

‎cross/libffi/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
libffi-3.3.tar.gz SHA1 8df6cb570c8d6596a67d1c0773bf00650154f7aa
2-
libffi-3.3.tar.gz SHA256 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
3-
libffi-3.3.tar.gz MD5 6313289e32f1d38a9df4770b014a2ca7
1+
libffi-3.4.2.tar.gz SHA1 460882cfdb52a2bd13fc08edc540b242ae421033
2+
libffi-3.4.2.tar.gz SHA256 540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620
3+
libffi-3.4.2.tar.gz MD5 294b921e6cf9ab0fbaea4b639f8fdbe8

‎cross/libffi/patches/ppc/001-fix_build_failure_on_power7_and_older.patch

-13
This file was deleted.

‎cross/libsodium/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PKG_NAME = libsodium
22
PKG_VERS = 1.0.18
33
PKG_EXT = tar.gz
4-
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
4+
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-stable.$(PKG_EXT)
55
PKG_DIST_SITE = https://download.libsodium.org/libsodium/releases
6-
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
6+
PKG_DIR = $(PKG_NAME)-stable
77

88
DEPENDS =
99

‎cross/libsodium/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
libsodium-1.0.18.tar.gz SHA1 795b73e3f92a362fabee238a71735579bf46bb97
2-
libsodium-1.0.18.tar.gz SHA256 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
3-
libsodium-1.0.18.tar.gz MD5 3ca9ebc13b6b4735acae0a6a4c4f9a95
1+
libsodium-1.0.18-stable.tar.gz SHA1 e78debf512a8f7465c00c1f7bb62d9745e57e905
2+
libsodium-1.0.18-stable.tar.gz SHA256 81869090064d09e9ff3be5a5fff52f9ed94cd06b0dc3b20e2aaa0d63be9395c6
3+
libsodium-1.0.18-stable.tar.gz MD5 e81038f2a8cf174b822e756271b3a5ac

‎cross/pip/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PKG_NAME = pip
22
# use the same version in native/python3/Makefile (python3_native_post_install)
3-
PKG_VERS = 21.1.3
3+
PKG_VERS = 21.2.4
44
PKG_EXT = tar.gz
55
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
66
PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/p/$(PKG_NAME)

‎cross/pip/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
pip-21.1.3.tar.gz SHA1 0c3e48a594ace3a68daa46d42b2b25ee9c658be4
2-
pip-21.1.3.tar.gz SHA256 b5b1eb91b36894bd01b8e5a56a422c2f3838573da0b0a1c63a096bb454e3b23f
3-
pip-21.1.3.tar.gz MD5 e459d41a10ce33688b5d389216a8876f
1+
pip-21.2.4.tar.gz SHA1 c6c9348c79a7f8448cd14b9e53baf141ea185dee
2+
pip-21.2.4.tar.gz SHA256 0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b
3+
pip-21.2.4.tar.gz MD5 efbdb4201a5e6383fb4d12e26f78f355

‎cross/python3/Makefile

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = python3
2-
PKG_VERS = 3.7.11
2+
PKG_VERS = 3.7.12
33
PKG_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
44
PKG_EXT = tar.xz
55
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
@@ -88,10 +88,13 @@ python3_post_install: $(WORK_DIR)/python-cc.mk
8888
mkdir -p $(PYTHON_LIB_CROSS)
8989
cp -R $(HOSTPYTHON_LIB_NATIVE) $(PYTHON_LIB_CROSS)/../
9090
@$(RUN) $(PYTHON_NATIVE) -m crossenv $(STAGING_INSTALL_PREFIX)/bin/python$(PKG_VERS_MAJOR_MINOR) $(WORK_DIR)/crossenv/
91-
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py -O - | build-python
92-
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py -O - | python
93-
. $(WORK_DIR)/crossenv/bin/activate && build-pip install "setuptools==44.1.0" "wheel==0.36.2"
94-
. $(WORK_DIR)/crossenv/bin/activate && pip install "setuptools==44.1.0" "wheel==0.36.2"
91+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py
92+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==21.2.4"
93+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==21.2.4"
94+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools==58.2.0"
95+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools==58.2.0"
96+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "wheel==0.37.0"
97+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "wheel==0.37.0"
9598
ifneq ($(PYTHON_LIB_NATIVE),$(PYTHON_LIB_CROSS))
9699
cp $(PYTHON_LIB_CROSS)/_sysconfigdata_*.py $(PYTHON_LIB_NATIVE)/_sysconfigdata.py
97100
endif

‎cross/python3/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Python-3.7.11.tar.xz SHA1 671e3fed4f3bb5a6663da0ae6691f0f8e9399427
2-
Python-3.7.11.tar.xz SHA256 ddb4196ab5c4f69e895920a422cb60d42b46e2de2b173ce7fd57f1435459a734
3-
Python-3.7.11.tar.xz MD5 b3671d35b61f5422605cedad32f3457a
1+
Python-3.7.12.tar.xz SHA1 ea7ed19e3a7cb3867e32c602e25da0b2689a3e31
2+
Python-3.7.12.tar.xz SHA256 f77bf7fb47839f213e5cbf7827281078ea90de7e72b44f10d7ef385ea8c43210
3+
Python-3.7.12.tar.xz MD5 352ea082224121a8b7bc4d6d06e5de39

‎cross/python38/Makefile

+48-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = python38
2-
PKG_VERS = 3.8.11
2+
PKG_VERS = 3.8.12
33
PKG_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
44
PKG_EXT = tar.xz
55
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
@@ -8,26 +8,55 @@ PKG_DIR = Python-$(PKG_VERS)
88

99
BUILD_DEPENDS = native/$(PKG_NAME)
1010

11-
DEPENDS = cross/zlib cross/openssl cross/sqlite cross/readline cross/ncursesw cross/bzip2 cross/xz
11+
DEPENDS = cross/zlib cross/sqlite cross/readline cross/ncursesw cross/bzip2 cross/xz
1212
# required for uuid module
1313
DEPENDS += cross/libuuid
14-
# libffi is no longer bundled with python
15-
DEPENDS += cross/libffi
1614

1715
HOMEPAGE = https://www.python.org/
1816
COMMENT = Python Programming Language
1917
LICENSE = PSF
2018

2119
GNU_CONFIGURE = 1
22-
CONFIGURE_ARGS = --enable-shared --enable-ipv6 --without-ensurepip --enable-loadable-sqlite-extensions
23-
CONFIGURE_ARGS += ac_cv_buggy_getaddrinfo=no ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no ac_cv_have_long_long_format=yes
20+
21+
CONFIGURE_ARGS = --enable-shared
22+
CONFIGURE_ARGS += --enable-ipv6
23+
CONFIGURE_ARGS += --without-ensurepip
24+
CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
25+
CONFIGURE_ARGS += --with-computed-gotos=yes
26+
CONFIGURE_ARGS += --enable-optimizations
27+
28+
CONFIGURE_ARGS += ac_cv_buggy_getaddrinfo=no
29+
CONFIGURE_ARGS += ac_cv_file__dev_ptmx=no
30+
CONFIGURE_ARGS += ac_cv_file__dev_ptc=no
31+
CONFIGURE_ARGS += ac_cv_have_long_long_format=yes
32+
33+
DEPENDS += cross/openssl
34+
CONFIGURE_ARGS += --with-ssl-default-suites=openssl
35+
36+
DEPENDS += cross/gdbm
37+
CONFIGURE_ARGS += --with-dbmliborder=gdbm:ndbm:bdb
38+
39+
DEPENDS += cross/expat
40+
CONFIGURE_ARGS += --with-system-expat
41+
42+
# libffi is no longer bundled with python
43+
DEPENDS += cross/libffi
44+
CONFIGURE_ARGS += --with-system-ffi
45+
46+
include ../../mk/spksrc.archs.mk
47+
48+
# Enable Link-Time Optimization
49+
ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
50+
CONFIGURE_ARGS += --with-lto
51+
endif
52+
2453
ADDITIONAL_CFLAGS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -L $(STAGING_INSTALL_PREFIX)/lib -I $(STAGING_INSTALL_PREFIX)/include
2554

26-
POST_PATCH_TARGET = python38_post_patch
55+
POST_PATCH_TARGET = python38_post_patch
2756
PRE_CONFIGURE_TARGET = python38_pre_configure
28-
COMPILE_TARGET = python38_compile
29-
INSTALL_TARGET = python38_install
30-
POST_INSTALL_TARGET = python38_post_install
57+
COMPILE_TARGET = python38_compile
58+
INSTALL_TARGET = python38_install
59+
POST_INSTALL_TARGET = python38_post_install
3160

3261
include ../../mk/spksrc.cross-cc.mk
3362

@@ -84,10 +113,15 @@ python38_post_install: $(WORK_DIR)/python-cc.mk
84113
mkdir -p $(PYTHON_LIB_CROSS)
85114
cp -R $(HOSTPYTHON_LIB_NATIVE) $(PYTHON_LIB_CROSS)/../
86115
@$(RUN) $(PYTHON_NATIVE) -m crossenv $(STAGING_INSTALL_PREFIX)/bin/python$(PKG_VERS_MAJOR_MINOR) $(WORK_DIR)/crossenv/
87-
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py -O - | build-python
88-
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py -O - | python
89-
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools==44.1.0" "wheel==0.36.2" "cffi==1.14.5"
90-
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools==44.1.0" "wheel==0.36.2" "cffi==1.14.5"
116+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py
117+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==21.2.4"
118+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==21.2.4"
119+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools==58.2.0"
120+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools==58.2.0"
121+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "wheel==0.37.0"
122+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "wheel==0.37.0"
123+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "cffi==1.14.6"
124+
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "cffi==1.14.6"
91125
ifneq ($(PYTHON_LIB_NATIVE),$(PYTHON_LIB_CROSS))
92126
cp $(PYTHON_LIB_CROSS)/_sysconfigdata_*.py $(PYTHON_LIB_NATIVE)/_sysconfigdata.py
93127
endif

‎cross/python38/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Python-3.8.11.tar.xz SHA1 1561060627fd171de19c53eb374cd92d2f297bff
2-
Python-3.8.11.tar.xz SHA256 fb1a1114ebfe9e97199603c6083e20b236a0e007a2c51f29283ffb50c1420fb2
3-
Python-3.8.11.tar.xz MD5 5840ba601128f48fee4e7c98fbdac65d
1+
Python-3.8.12.tar.xz SHA1 7643eccc15f5606bd0dc04affc7ea901e417165d
2+
Python-3.8.12.tar.xz SHA256 b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea
3+
Python-3.8.12.tar.xz MD5 9dd8f82e586b776383c82e27923f8795

‎cross/setuptools/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PKG_NAME = setuptools
2-
PKG_VERS = 49.6.0
3-
PKG_EXT = zip
2+
PKG_VERS = 58.2.0
3+
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/s/$(PKG_NAME)
66
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

‎cross/setuptools/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
setuptools-49.6.0.zip SHA1 14103612bfd0ff4e5a9469abaa5ecbdc811d5293
2-
setuptools-49.6.0.zip SHA256 46bd862894ed22c2edff033c758c2dc026324788d758e96788e8f7c11f4e9707
3-
setuptools-49.6.0.zip MD5 1734619cdb69694cd5939caf60edc8a5
1+
setuptools-58.2.0.tar.gz SHA1 5d97de0e774b2269c85685a4aa8fd5956bcfd2bb
2+
setuptools-58.2.0.tar.gz SHA256 2c55bdb85d5bb460bd2e3b12052b677879cffcf46c0c688f2e5bf51d36001145
3+
setuptools-58.2.0.tar.gz MD5 ff20ab7e0d51c5ad0a9438c50e598c06

‎cross/wheel/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = wheel
2-
PKG_VERS = 0.36.2
2+
PKG_VERS = 0.37.0
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/w/$(PKG_NAME)

‎cross/wheel/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
wheel-0.36.2.tar.gz SHA1 be566aa87fa26a25f29c53f8a1bfe1f722534457
2-
wheel-0.36.2.tar.gz SHA256 e11eefd162658ea59a60a0f6c7d493a7190ea4b9a85e335b33489d9f17e0245e
3-
wheel-0.36.2.tar.gz MD5 800401c0549ea01449dc47305858c833
1+
wheel-0.37.0.tar.gz SHA1 d25b95c1e0048051e5a94d7e9f415d253195eb0b
2+
wheel-0.37.0.tar.gz SHA256 e2ef7239991699e3355d54f8e968a21bb940a1dbf34a4d226741e64462516fad
3+
wheel-0.37.0.tar.gz MD5 79f55b898e6f274f5586bbde39f6fe8e

‎mk/spksrc.wheel.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ build_wheel_target: $(PRE_WHEEL_TARGET)
6363
if [ ! -z "$(CROSS_COMPILE_WHEELS)" ] ; then \
6464
$(MSG) "Force cross-compile" ; \
6565
if [ -z "$(CROSSENV)" ]; then \
66-
$(RUN) _PYTHON_HOST_PLATFORM="$(TC_TARGET)" CFLAGS="$(CFLAGS) -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) $(WHEELS_CFLAGS)" LDFLAGS="$(LDFLAGS) $(WHEELS_LDFLAGS)" $(PIP_WHEEL) ; \
66+
$(RUN) _PYTHON_HOST_PLATFORM="$(TC_TARGET)" CFLAGS="$(CFLAGS) -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) $(WHEELS_CFLAGS)" LDFLAGS="$(LDFLAGS) $(WHEELS_LDFLAGS)" $(PIP_WHEEL) --use-deprecated=legacy-resolver ; \
6767
else \
68-
. $(CROSSENV) && $(RUN) _PYTHON_HOST_PLATFORM="$(TC_TARGET)" CFLAGS="$(CFLAGS) -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) $(WHEELS_CFLAGS)" LDFLAGS="$(LDFLAGS) $(WHEELS_LDFLAGS)" pip $(PIP_WHEEL_ARGS) --no-build-isolation ; \
68+
. $(CROSSENV) && $(RUN) _PYTHON_HOST_PLATFORM="$(TC_TARGET)" CFLAGS="$(CFLAGS) -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR) $(WHEELS_CFLAGS)" LDFLAGS="$(LDFLAGS) $(WHEELS_LDFLAGS)" pip $(PIP_WHEEL_ARGS) --use-deprecated=legacy-resolver --no-build-isolation ; \
6969
fi ; \
7070
else \
7171
$(MSG) "Force pure-python" ; \

‎native/python3/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = python3
2-
PKG_VERS = 3.7.11
2+
PKG_VERS = 3.7.12
33
PKG_EXT = tar.xz
44
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
@@ -26,8 +26,8 @@ PIP_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/install/usr/loc
2626
python3_native_post_install: $(WORK_DIR)/python-native.mk
2727
@$(MSG) Installing pip, setuptools, cffi and cross env
2828
@$(RUN) wget https://bootstrap.pypa.io/get-pip.py
29-
@$(RUN) $(PYTHON) get-pip.py "pip==21.1.3"
30-
@$(PIP) install "setuptools==49.6.0" "cffi==1.14.6" "crossenv==1.0"
29+
@$(RUN) $(PYTHON) get-pip.py "pip==21.2.4"
30+
@$(PIP) install "setuptools==58.2.0" "cffi==1.14.6" "crossenv>=1.1.4"
3131

3232
$(WORK_DIR)/python-native.mk:
3333
@echo PIP=$(PIP_NATIVE) >> $@

‎native/python3/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Python-3.7.11.tar.xz SHA1 671e3fed4f3bb5a6663da0ae6691f0f8e9399427
2-
Python-3.7.11.tar.xz SHA256 ddb4196ab5c4f69e895920a422cb60d42b46e2de2b173ce7fd57f1435459a734
3-
Python-3.7.11.tar.xz MD5 b3671d35b61f5422605cedad32f3457a
1+
Python-3.7.12.tar.xz SHA1 ea7ed19e3a7cb3867e32c602e25da0b2689a3e31
2+
Python-3.7.12.tar.xz SHA256 f77bf7fb47839f213e5cbf7827281078ea90de7e72b44f10d7ef385ea8c43210
3+
Python-3.7.12.tar.xz MD5 352ea082224121a8b7bc4d6d06e5de39

‎native/python38/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = python38
2-
PKG_VERS = 3.8.11
2+
PKG_VERS = 3.8.12
33
PKG_EXT = tar.xz
44
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
@@ -26,8 +26,8 @@ PIP_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/install/usr/loc
2626
python38_native_post_install: $(WORK_DIR)/python-native.mk
2727
@$(MSG) Installing pip, setuptools, cffi and cross env
2828
@$(RUN) wget https://bootstrap.pypa.io/get-pip.py
29-
@$(RUN) $(PYTHON) get-pip.py "pip==21.1.3"
30-
@$(PIP) install "setuptools==49.6.0" "cffi==1.14.6" "crossenv==1.0"
29+
@$(RUN) $(PYTHON) get-pip.py "pip==21.2.4"
30+
@$(PIP) install "setuptools==58.2.0" "cffi==1.14.6" "crossenv==1.0"
3131

3232
$(WORK_DIR)/python-native.mk:
3333
@echo PIP=$(PIP_NATIVE) >> $@

‎native/python38/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Python-3.8.11.tar.xz SHA1 1561060627fd171de19c53eb374cd92d2f297bff
2-
Python-3.8.11.tar.xz SHA256 fb1a1114ebfe9e97199603c6083e20b236a0e007a2c51f29283ffb50c1420fb2
3-
Python-3.8.11.tar.xz MD5 5840ba601128f48fee4e7c98fbdac65d
1+
Python-3.8.12.tar.xz SHA1 7643eccc15f5606bd0dc04affc7ea901e417165d
2+
Python-3.8.12.tar.xz SHA256 b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea
3+
Python-3.8.12.tar.xz MD5 9dd8f82e586b776383c82e27923f8795

‎spk/beets/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SPK_NAME = beets
22
SPK_VERS = 1.4.9
3-
SPK_REV = 5
3+
SPK_REV = 6
44
SPK_ICON = src/beets.png
55

66
PIP = $(WORK_DIR)/../../../native/python3/work-native/install/usr/local/bin/pip

‎spk/beets/src/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ musicbrainzngs==0.7.1
1010
munkres==1.1.2
1111

1212
# Plugin dependencies
13-
beautifulsoup4==4.8.2
13+
beautifulsoup4==4.10.0
1414
certifi==2019.11.28
1515
chardet==3.0.4
1616
discogs-client==2.2.2

‎spk/flexget/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SPK_NAME = flexget
22
SPK_VERS = 3.1.129
3-
SPK_REV = 9
3+
SPK_REV = 10
44
SPK_ICON = src/${SPK_NAME}.png
55

66
BUILD_DEPENDS = cross/python3 cross/setuptools cross/pip cross/wheel

‎spk/flexget/src/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ aniso8601==9.0.1
77
APScheduler==3.7.0
88
attrs==20.3.0
99
babelfish==0.5.5
10-
beautifulsoup4==4.9.3
10+
beautifulsoup4==4.10.0
1111
Brotli==1.0.9
1212
certifi==2020.12.5
1313
chardet==4.0.0

‎spk/homeassistant/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ SPK_ICON = src/${SPK_NAME}.png
66
SPK_DEPENDS = "python38"
77

88
BUILD_DEPENDS = cross/python38 cross/setuptools cross/pip cross/wheel
9-
BUILD_DEPENDS += cross/poetry
109

1110
DEPENDS += cross/libyaml cross/bcrypt cross/cryptography cross/pycrypto cross/pycryptodomex
1211
DEPENDS += cross/pillow

‎spk/python3/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SPK_NAME = python3
2-
SPK_VERS = 3.7.11
2+
SPK_VERS = 3.7.12
33
SPK_SHORT_VERS = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS)))
4-
SPK_REV = 18
4+
SPK_REV = 19
55
SPK_ICON = src/python3.png
66

77
DEPENDS = cross/busybox cross/$(SPK_NAME)
@@ -21,7 +21,7 @@ DESCRIPTION_SPN = Lenguaje de programación Python.
2121

2222
STARTABLE = no
2323
DISPLAY_NAME = Python3
24-
CHANGELOG = "1. Update to Python 3.7.11.<br/>2. Update OpenSSL to v1.1.1l"
24+
CHANGELOG = "1. Update to Python 3.7.12.<br/>2. Update OpenSSL to v1.1.1l<br/>3. Update all requirements.txt"
2525

2626
HOMEPAGE = https://www.python.org
2727
LICENSE = PSF

0 commit comments

Comments
 (0)