Merge pull request #14845 from jefferyto/python-3.7.10-openwrt-19.07

[openwrt-19.07] python3: Update to 3.7.10, refresh patches
This commit is contained in:
Josef Schlehofer 2021-02-22 18:46:34 +01:00 committed by GitHub
commit da74b6448f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View file

@ -8,7 +8,7 @@
# Note: keep in sync with setuptools & pip
PYTHON3_VERSION_MAJOR:=3
PYTHON3_VERSION_MINOR:=7
PYTHON3_VERSION_MICRO:=9
PYTHON3_VERSION_MICRO:=10
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)

View file

@ -19,7 +19,7 @@ PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
PKG_HASH:=91923007b05005b5f9bd46f3b9172248aea5abc1543e8a636d59e629c3331b01
PKG_HASH:=f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>, Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=Python/2.0

View file

@ -12,9 +12,9 @@ https://git.alpinelinux.org/aports/tree/main/python2/musl-find_library.patch
+ from glob import glob
+ musl_ldso = glob('/lib/ld-musl-*.so.1')
def _findLib_gcc(name):
# Run GCC's linker with the -t (aka --trace) option and examine the
@@ -252,6 +254,57 @@ elif os.name == "posix":
def _is_elf(filename):
"Return True if the given file is an ELF file"
@@ -265,6 +267,57 @@ elif os.name == "posix":
def find_library(name, is64 = False):
return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name))