From 3dcc4d315a8b729debc2d722dac54929e4536c57 Mon Sep 17 00:00:00 2001 From: PktSurf Date: Fri, 23 Sep 2022 10:25:45 +0530 Subject: [PATCH] Upgraded base/python to 3.9.14 --- base/python3/fix-xattrs-glibc.patch | 15 --- base/python3/musl-find_library.patch | 5 +- base/python3/python3-includedirs.patch | 17 --- base/python3/python3-pathsearch.patch | 129 -------------------- base/python3/python3-sysconfig-prefix.patch | 58 --------- base/python3/python3.SMBuild | 36 ++---- 6 files changed, 13 insertions(+), 247 deletions(-) delete mode 100644 base/python3/fix-xattrs-glibc.patch delete mode 100644 base/python3/python3-includedirs.patch delete mode 100644 base/python3/python3-pathsearch.patch delete mode 100644 base/python3/python3-sysconfig-prefix.patch diff --git a/base/python3/fix-xattrs-glibc.patch b/base/python3/fix-xattrs-glibc.patch deleted file mode 100644 index 57a8fb7..0000000 --- a/base/python3/fix-xattrs-glibc.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 8f8ba25..72b92da 100644 ---- a/Modules/posixmodule.c -+++ b/Modules/posixmodule.c -@@ -103,8 +103,9 @@ corresponding Unix manual entries for more information on calls."); - #undef HAVE_SCHED_SETAFFINITY - #endif - --#if defined(HAVE_SYS_XATTR_H) && defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__GNU__) -+#if defined(HAVE_SYS_XATTR_H) && defined(__linux__) && !defined(__FreeBSD_kernel__) && !defined(__GNU__) - #define USE_XATTRS -+#include - #endif - - #ifdef USE_XATTRS diff --git a/base/python3/musl-find_library.patch b/base/python3/musl-find_library.patch index 7899abb..82f436b 100644 --- a/base/python3/musl-find_library.patch +++ b/base/python3/musl-find_library.patch @@ -1,6 +1,5 @@ -diff -ru Python-2.7.12.orig/Lib/ctypes/util.py Python-2.7.12/Lib/ctypes/util.py ---- Python-2.7.12.orig/Lib/ctypes/util.py 2016-06-26 00:49:30.000000000 +0300 -+++ Python-2.7.12/Lib/ctypes/util.py 2016-11-03 16:05:46.954665040 +0200 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py @@ -204,6 +204,41 @@ def find_library(name, is64 = False): return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name)) diff --git a/base/python3/python3-includedirs.patch b/base/python3/python3-includedirs.patch deleted file mode 100644 index c97681c..0000000 --- a/base/python3/python3-includedirs.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- Python-3.7.3.orig/setup.py -+++ Python-3.7.3/setup.py -@@ -536,8 +536,12 @@ - add_dir_to_list(self.compiler.library_dirs, - d) - elif is_gcc and in_incdirs and '/gcc/' not in line: -- add_dir_to_list(self.compiler.include_dirs, -- line.strip()) -+ incdir = line.strip() -+ add_dir_to_list(self.compiler.include_dirs, incdir) -+ libdir = incdir.replace("/include", "/lib") -+ if libdir != incdir: -+ add_dir_to_list(self.compiler.library_dirs, -+ libdir) - finally: - os.unlink(tmpfile) - diff --git a/base/python3/python3-pathsearch.patch b/base/python3/python3-pathsearch.patch deleted file mode 100644 index 26f2125..0000000 --- a/base/python3/python3-pathsearch.patch +++ /dev/null @@ -1,129 +0,0 @@ ---- Python-3.7.3.orig/Modules/getpath.c -+++ Python-3.7.3/Modules/getpath.c -@@ -121,6 +121,7 @@ - wchar_t *pythonpath; /* PYTHONPATH define */ - wchar_t *prefix; /* PREFIX define */ - wchar_t *exec_prefix; /* EXEC_PREFIX define */ -+ wchar_t *smlinux_staging_dir; /* SMLINUX_STAGING_DIR define */ - - wchar_t *lib_python; /* "lib/pythonX.Y" */ - wchar_t argv0_path[MAXPATHLEN+1]; -@@ -155,9 +156,16 @@ - reduce(wchar_t *dir) - { - size_t i = wcslen(dir); -+ if (i == 1 && dir[0] == SEP) { -+ /* L"/" becomes L"" */ -+ dir[0] = L'\0'; -+ return; -+ } - while (i > 0 && dir[i] != SEP) - --i; -- dir[i] = '\0'; -+ if (i == 0 && dir[0] == SEP) -+ i = 1; /* L"/blah" becomes L"/" */ -+ dir[i] = L'\0'; - } - - -@@ -374,6 +382,15 @@ - } - } - -+ /* If argv[0] appears to be in smlinux's staging directory, -+ * then skip to the following PREFIX check, -+ * otherwise proceed as normal to preserve virtual environments. -+ */ -+ if (!wcsncmp(calculate->smlinux_staging_dir, calculate->argv0_path, -+ wcslen(calculate->smlinux_staging_dir)) || -+ !wcsncmp(calculate->argv0_path, L"/bin/../", 8)) -+ goto skip_argv0_path; -+ - /* Search from argv0_path, until root is found */ - copy_absolute(prefix, calculate->argv0_path, MAXPATHLEN+1); - do { -@@ -386,9 +403,15 @@ - prefix[n] = L'\0'; - reduce(prefix); - } while (prefix[0]); -+ skip_argv0_path: - - /* Look at configure's PREFIX */ -- wcsncpy(prefix, calculate->prefix, MAXPATHLEN); -+ if (wcslen(calculate->prefix)) -+ wcsncpy(prefix, calculate->prefix, MAXPATHLEN); -+ else { -+ prefix[0] = '/'; -+ prefix[1] = 0; -+ } - prefix[MAXPATHLEN] = L'\0'; - joinpath(prefix, calculate->lib_python); - joinpath(prefix, LANDMARK); -@@ -495,6 +518,15 @@ - } - } - -+ /* If argv[0] appears to be in smlinux's staging directory, -+ * then skip to the following EXEC_PREFIX check, -+ * otherwise proceed as normal to preserve virtual environments. -+ */ -+ if (!wcsncmp(calculate->smlinux_staging_dir, calculate->argv0_path, -+ wcslen(calculate->smlinux_staging_dir)) || -+ !wcsncmp(calculate->argv0_path, L"/bin/../", 8)) -+ goto skip_argv0_path; -+ - /* Search from argv0_path, until root is found */ - copy_absolute(exec_prefix, calculate->argv0_path, MAXPATHLEN+1); - do { -@@ -507,9 +539,16 @@ - exec_prefix[n] = L'\0'; - reduce(exec_prefix); - } while (exec_prefix[0]); -+ skip_argv0_path: - - /* Look at configure's EXEC_PREFIX */ -- wcsncpy(exec_prefix, calculate->exec_prefix, MAXPATHLEN); -+ if (strlen(EXEC_PREFIX)) { -+ wcsncpy(exec_prefix, calculate->exec_prefix, MAXPATHLEN); -+ } -+ else { -+ exec_prefix[0] = L'/'; -+ exec_prefix[1] = L'\0'; -+ } - exec_prefix[MAXPATHLEN] = L'\0'; - joinpath(exec_prefix, calculate->lib_python); - joinpath(exec_prefix, L"lib-dynload"); -@@ -829,7 +868,9 @@ - } - - bufsz += wcslen(calculate->zip_path) + 1; -- bufsz += wcslen(exec_prefix) + 1; -+ if (wcslen(exec_prefix)) { -+ bufsz += wcslen(exec_prefix) + 1; -+ } - - /* Allocate the buffer */ - wchar_t *buf = PyMem_RawMalloc(bufsz * sizeof(wchar_t)); -@@ -880,7 +921,10 @@ - wcscat(buf, delimiter); - - /* Finally, on goes the directory for dynamic-load modules */ -- wcscat(buf, exec_prefix); -+ if (wcslen(exec_prefix)) { -+ wcscat(buf, delimiter); -+ wcscat(buf, exec_prefix); -+ } - - config->module_search_path = buf; - return _Py_INIT_OK(); -@@ -908,6 +952,10 @@ - if (!calculate->prefix) { - return DECODE_LOCALE_ERR("PREFIX define", len); - } -+ calculate->smlinux_staging_dir = Py_DecodeLocale(SMLINUX_STAGING_DIR, &len); -+ if (!calculate->smlinux_staging_dir) { -+ return DECODE_LOCALE_ERR("SMLINUX_STAGING_DIR define", len); -+ } - calculate->exec_prefix = Py_DecodeLocale(EXEC_PREFIX, &len); - if (!calculate->prefix) { - return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); diff --git a/base/python3/python3-sysconfig-prefix.patch b/base/python3/python3-sysconfig-prefix.patch deleted file mode 100644 index 03945f2..0000000 --- a/base/python3/python3-sysconfig-prefix.patch +++ /dev/null @@ -1,58 +0,0 @@ -this patch fixes 3 things: -1) native: if prefix is empty, use "/" to construct the pathname, otherwise - we will end up with something like `-I include/python2.7` -2) cross-compile: if we're cross-compiling, we're reusing the - PKG_CONFIG_SYSROOT_DIR environment variable to prefix the include/lib path. - this though helps only when the system doing the crosscompile uses the so- - patched python. we therefore assume a sabotage host system is used. -3) previously, the right logic for selecting LD_SHARED was only used on Mac. - it should be done on any POSIX system (CC overrides). - ---- Python-3.7.3.orig/Lib/distutils/sysconfig.py -+++ Python-3.7.3/Lib/distutils/sysconfig.py -@@ -92,7 +92,7 @@ - If 'prefix' is supplied, use it instead of sys.base_prefix or - sys.base_exec_prefix -- i.e., ignore 'plat_specific'. - """ -- if prefix is None: -+ if prefix is None or prefix == '': - prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX - if os.name == "posix": - if python_build: -@@ -107,7 +107,8 @@ - incdir = os.path.join(get_config_var('srcdir'), 'Include') - return os.path.normpath(incdir) - python_dir = 'python' + get_python_version() + build_flags -- return os.path.join(prefix, "include", python_dir) -+ sysroot = os.environ.get('PKG_CONFIG_SYSROOT_DIR', '') -+ return os.path.join(sysroot + prefix, "include", python_dir) - elif os.name == "nt": - if python_build: - # Include both the include and PC dir to ensure we can find -@@ -135,14 +136,15 @@ - If 'prefix' is supplied, use it instead of sys.base_prefix or - sys.base_exec_prefix -- i.e., ignore 'plat_specific'. - """ -- if prefix is None: -+ if prefix is None or prefix == '': - if standard_lib: - prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX - else: - prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": -- libpython = os.path.join(prefix, -+ sysroot = os.environ.get('PKG_CONFIG_SYSROOT_DIR', '') -+ libpython = os.path.join(sysroot + prefix, - "lib", "python" + get_python_version()) - if standard_lib: - return libpython -@@ -189,7 +191,7 @@ - - if 'CC' in os.environ: - newcc = os.environ['CC'] -- if (sys.platform == 'darwin' -+ if ((sys.platform == 'darwin' or os.name == 'posix') - and 'LDSHARED' not in os.environ - and ldshared.startswith(cc)): - # On OS X, if CC is overridden, use that as the default diff --git a/base/python3/python3.SMBuild b/base/python3/python3.SMBuild index 489c8d5..fd916a9 100755 --- a/base/python3/python3.SMBuild +++ b/base/python3/python3.SMBuild @@ -1,5 +1,5 @@ app=python3 -version=3.7.10 +version=3.9.14 build=1sml homepage="https://www.python.org/" download="https://www.python.org/ftp/python/$version/Python-$version.tar.xz" @@ -15,31 +15,21 @@ build() { cd "Python-$version" fixbuilddirpermissions - applypatch $srcdir/fix-xattrs-glibc.patch applypatch $srcdir/musl-find_library.patch - applypatch $srcdir/python3-includedirs.patch - applypatch $srcdir/python3-pathsearch.patch - applypatch $srcdir/python3-sysconfig-prefix.patch - sed -i -e "s|^#.* /usr/local/bin/python|#!/bin/python3|" Lib/cgi.py - find . -name '*.py' -exec \ - sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python3|" {} + + sed -i "s|^#.* /usr/local/bin/python|#!/bin/python3|" Lib/cgi.py + find . -name "*.py" -exec \ + sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/bin/env python3|" {} + - ac_cv_lib_readline_rl_callback_handler_install=no \ - ac_cv_lib_readline_rl_pre_input_hook=no \ - ac_cv_lib_readline_rl_completion_display_matches_hook=no \ - ac_cv_have_long_long_format=yes \ - ac_cv_func_timegm=yes \ - ac_cv_file__dev_ptc=no \ - ac_cv_file__dev_ptmx=yes \ - CFLAGS="$CFLAGS -D_BSD_SOURCE -DSMLINUX_STAGING_DIR='\"$pkg/\"'" \ LDFLAGS="-lncursesw -lterminfo" \ ./configure \ - --prefix= \ + --prefix="/" \ + --libdir="/lib" \ --with-system-expat \ --with-system-ffi \ --without-cxx-main \ - --without-ensurepip + --without-ensurepip \ + --enable-shared make $MAKEFLAGS make install DESTDIR=$pkg @@ -50,7 +40,7 @@ build() { unittest/test tkinter/test \ bsddb/test json/tests lib2to3/tests\ distutils/tests tests ; do - rm -rf "$pkg"/lib/python3.7/"$test" + rm -rf "$pkg"/lib/python3.9/"$test" done ( cd $pkg/bin ; ln -s python3 python ) @@ -59,10 +49,6 @@ build() { } sha512sums=" -5cb61739acbd29f526d25073443398b2ca0eef30d01d134e8236c8bbc7ab0586c44ec00689f5a75e6aedc0170acf4551721ada5e967e4b99a146cfcaad949128 Python-3.7.10.tar.xz -37b6ee5d0d5de43799316aa111423ba5a666c17dc7f81b04c330f59c1d1565540eac4c585abe2199bbed52ebe7426001edb1c53bd0a17486a2a8e052d0f494ad fix-xattrs-glibc.patch -ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2 musl-find_library.patch -3542288821723c00651248935537ee2141e9510473c00b096713581bcc75d2e57ad73d69f4e0eaad9e9d231832f1764eb8f3cd52fac80a388e2b9caae25bfe92 python3-includedirs.patch -a72ac0cb27787f5dd52ef3cdec10f12be08009b0fbd6c21cfc3cec98083a8556513bf2548220376384268449f022f24fa488ff57e4d1f9ca4622ae94aca79281 python3-pathsearch.patch -f87338142ef6ce222c165c1aca618c71e6d2d4467007ff20a26cef95580f7bd01c7bac2d45741450b9e93191e67d798cf7ba71fb24c265f1f24e6d92f2f34dce python3-sysconfig-prefix.patch +691a7814cf6c7bee96d8dbb7c5c85cb11f2e999101e20491b99435cdec07c3bbd5ce43ad3d9c64f695383b79197884caa1965c4346e4525e23b09c686271e4ab Python-3.9.14.tar.xz +9abb510f769fee9c212be728f71802cdd3346b65f052dcc820686feee53a51ad106e4f34e439c5d9dd5da7a00559b07ad0fee4815ebd16fbfb170ba228fc37f5 musl-find_library.patch "