diff --git a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml index c29363c05..1a98b7119 100644 --- a/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml +++ b/.ci_support/linux_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml @@ -37,7 +37,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.12' +- '3.13' readline: - '8' sqlite: diff --git a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_main.yaml b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_main.yaml index e36dd35f9..665277938 100644 --- a/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/linux_64_build_typereleasechannel_targetsconda-forge_main.yaml @@ -37,7 +37,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.12' +- '3.13' readline: - '8' sqlite: diff --git a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debug.yaml b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debug.yaml index f8c064ec2..645b51b05 100644 --- a/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debug.yaml +++ b/.ci_support/linux_aarch64_build_typedebugchannel_targetsconda-forge_python_debug.yaml @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.12' +- '3.13' readline: - '8' sqlite: diff --git a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_main.yaml b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_main.yaml index 116d25a45..5dfc482a7 100644 --- a/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/linux_aarch64_build_typereleasechannel_targetsconda-forge_main.yaml @@ -41,7 +41,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.12' +- '3.13' readline: - '8' sqlite: diff --git a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debug.yaml b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debug.yaml index 663fa2527..1cdebbcc3 100644 --- a/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debug.yaml +++ b/.ci_support/linux_ppc64le_build_typedebugchannel_targetsconda-forge_python_debug.yaml @@ -37,7 +37,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.12' +- '3.13' readline: - '8' sqlite: diff --git a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_main.yaml b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_main.yaml index 8b77b8906..8f02c13df 100644 --- a/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/linux_ppc64le_build_typereleasechannel_targetsconda-forge_main.yaml @@ -37,7 +37,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.12' +- '3.13' readline: - '8' sqlite: diff --git a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml index ab3f07f75..fcee8d942 100644 --- a/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml +++ b/.ci_support/osx_64_build_typedebugchannel_targetsconda-forge_python_debug.yaml @@ -37,7 +37,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.12' +- '3.13' readline: - '8' sqlite: diff --git a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_main.yaml b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_main.yaml index 614f0f48a..f988ad05a 100644 --- a/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/osx_64_build_typereleasechannel_targetsconda-forge_main.yaml @@ -37,7 +37,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.12' +- '3.13' readline: - '8' sqlite: diff --git a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debug.yaml b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debug.yaml index 6bc8d62b7..d8cdbc9d2 100644 --- a/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debug.yaml +++ b/.ci_support/osx_arm64_build_typedebugchannel_targetsconda-forge_python_debug.yaml @@ -37,7 +37,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.12' +- '3.13' readline: - '8' sqlite: diff --git a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_main.yaml b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_main.yaml index 3796ea1ef..f5b37bff0 100644 --- a/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_main.yaml +++ b/.ci_support/osx_arm64_build_typereleasechannel_targetsconda-forge_main.yaml @@ -37,7 +37,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.12' +- '3.13' readline: - '8' sqlite: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index ea1efabe6..db0f8017c 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -23,7 +23,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.12' +- '3.13' sqlite: - '3' target_platform: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fe32deb31..facf7cfed 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ -{% set version = "3.12.4" %} -{% set dev = "" %} +{% set version = "3.13.0" %} +{% set dev = "rc1" %} {% set dev_ = "" %} {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} @@ -46,33 +46,9 @@ source: {% else %} - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}{{ dev }}/ - md5: d68f25193eec491eb54bc2ea664a05bd + md5: 9213ecfedc510ac2a14c0eeea96baf02 {% endif %} - patches: - - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch - - patches/0002-Win32-Do-not-download-externals.patch - - patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch - - patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch - - patches/0005-Unvendor-openssl.patch - - patches/0006-Unvendor-sqlite3.patch - - patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch - - patches/0008-Doing-d1trimfile.patch - # https://github.com/python/cpython/pull/23523 - - patches/0009-cross-compile-darwin.patch - - patches/0010-Fix-TZPATH-on-windows.patch - # https://github.com/python/cpython/pull/24324 - - patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch - - patches/0012-Unvendor-bzip2.patch - - patches/0013-Unvendor-libffi.patch - - patches/0014-Unvendor-tcltk.patch - - patches/0015-unvendor-xz.patch - - patches/0016-unvendor-zlib.patch - - patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch - - patches/0018-Unvendor-expat.patch - - patches/0019-Remove-unused-readelf.patch - - patches/0020-Don-t-checksharedmods-if-cross-compiling.patch - - patches/0021-Override-configure-LIBFFI.patch - - patches/0022-Allow-linking-ncursesw-panelw-on-macOS-if-available.patch + build: number: {{ build_number }} @@ -260,8 +236,6 @@ outputs: - python -c "from ctypes import CFUNCTYPE; CFUNCTYPE(None)(id)" # Test for wide character supported via ncursesw - TERM=xterm >/dev/null python -c "import curses; scr = curses.initscr(); curses.unget_wch('x'); assert 'x' == scr.get_wch()" # [unix] - # crypt module will be removed in 3.13 => this failing is a reminder to remove the libxcrypt dependency - - python -c "import crypt" # [unix] - name: libpython-static script: build_static.sh # [unix] diff --git a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch b/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch deleted file mode 100644 index b0aefe51d..000000000 --- a/recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4f915b76bf52d9a4a355e0047b0ac8d66a8ec336 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Wed, 16 Aug 2017 11:53:55 +0100 -Subject: [PATCH 01/22] Win32: Change FD_SETSIZE from 512 to 2048 - -https://github.com/ContinuumIO/anaconda-issues/issues/1241 ---- - Modules/selectmodule.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c -index 97f1db20f6..166222bafb 100644 ---- a/Modules/selectmodule.c -+++ b/Modules/selectmodule.c -@@ -46,7 +46,7 @@ - FD_SETSIZE higher before this; e.g., via compiler /D switch. - */ - #if defined(MS_WINDOWS) && !defined(FD_SETSIZE) --#define FD_SETSIZE 512 -+#define FD_SETSIZE 2048 - #endif - - #if defined(HAVE_POLL_H) diff --git a/recipe/patches/0002-Win32-Do-not-download-externals.patch b/recipe/patches/0002-Win32-Do-not-download-externals.patch deleted file mode 100644 index e9ca11c7a..000000000 --- a/recipe/patches/0002-Win32-Do-not-download-externals.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 89ac50838fc3c43b63342d7b9c434fe68e11d678 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Thu, 7 Sep 2017 11:35:47 +0100 -Subject: [PATCH 02/22] Win32: Do not download externals - ---- - PCbuild/build.bat | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/PCbuild/build.bat b/PCbuild/build.bat -index d333ceabd2..11e3d16a4f 100644 ---- a/PCbuild/build.bat -+++ b/PCbuild/build.bat -@@ -97,7 +97,7 @@ if "%IncludeCTypes%"=="" set IncludeCTypes=true - if "%IncludeSSL%"=="" set IncludeSSL=true - if "%IncludeTkinter%"=="" set IncludeTkinter=true - --if "%IncludeExternals%"=="true" call "%dir%get_externals.bat" -+rem if "%IncludeExternals%"=="true" call "%dir%get_externals.bat" - - if "%do_pgo%" EQU "true" if "%platf%" EQU "x64" ( - if "%PROCESSOR_ARCHITEW6432%" NEQ "AMD64" if "%PROCESSOR_ARCHITECTURE%" NEQ "AMD64" ( diff --git a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch deleted file mode 100644 index 89ad52dab..000000000 --- a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 1add97729db66a572b0ad8f26186071c6d1b19fd Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Tue, 5 Dec 2017 22:47:59 +0000 -Subject: [PATCH 03/22] Fix find_library so that it looks in sys.prefix/lib - first - ---- - Lib/ctypes/macholib/dyld.py | 4 ++++ - Lib/ctypes/util.py | 27 ++++++++++++++++++++++++--- - 2 files changed, 28 insertions(+), 3 deletions(-) - -diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py -index 583c47daff..ab9b01c87e 100644 ---- a/Lib/ctypes/macholib/dyld.py -+++ b/Lib/ctypes/macholib/dyld.py -@@ -93,6 +93,10 @@ def dyld_executable_path_search(name, executable_path=None): - # If we haven't done any searching and found a library and the - # dylib_name starts with "@executable_path/" then construct the - # library name. -+ if not executable_path: -+ import sys -+ if sys.prefix: -+ executable_path = os.path.join(sys.prefix, 'bin') - if name.startswith('@executable_path/') and executable_path is not None: - yield os.path.join(executable_path, name[len('@executable_path/'):]) - -diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index c550883e7c..78b0b014f0 100644 ---- a/Lib/ctypes/util.py -+++ b/Lib/ctypes/util.py -@@ -70,7 +70,8 @@ def find_library(name): - elif os.name == "posix" and sys.platform == "darwin": - from ctypes.macholib.dyld import dyld_find as _dyld_find - def find_library(name): -- possible = ['lib%s.dylib' % name, -+ possible = ['@executable_path/../lib/lib%s.dylib' % name, -+ 'lib%s.dylib' % name, - '%s.dylib' % name, - '%s.framework/%s' % (name, name)] - for name in possible: -@@ -327,10 +328,30 @@ def _findLib_ld(name): - pass # result will be None - return result - -+ def _findLib_prefix(name): -+ if not name: -+ return None -+ for fullname in (name, "lib%s.so" % (name)): -+ path = os.path.join(sys.prefix, 'lib', fullname) -+ if os.path.exists(path): -+ return path -+ return None -+ - def find_library(name): - # See issue #9998 -- return _findSoname_ldconfig(name) or \ -- _get_soname(_findLib_gcc(name)) or _get_soname(_findLib_ld(name)) -+ # Yes calling _findLib_prefix twice is deliberate, because _get_soname ditches -+ # the full path. -+ # When objdump is unavailable this returns None -+ so_name = _get_soname(_findLib_prefix(name)) or name -+ if so_name != name: -+ return _findLib_prefix(so_name) or \ -+ _findLib_prefix(name) or \ -+ _findSoname_ldconfig(name) or \ -+ _get_soname(_findLib_gcc(name)) or _get_soname(_findLib_ld(name)) -+ else: -+ return _findLib_prefix(name) or \ -+ _findSoname_ldconfig(name) or \ -+ _get_soname(_findLib_gcc(name)) or _get_soname(_findLib_ld(name)) - - ################################################################ - # test code diff --git a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch deleted file mode 100644 index 98b125fa7..000000000 --- a/recipe/patches/0004-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4c0b20c3cebfcb8eaa0406c7b626322d01087492 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Sat, 27 Oct 2018 18:48:30 +0100 -Subject: [PATCH 04/22] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS - is not 0 - -Co-authored-by: Isuru Fernando ---- - Modules/getpath.c | 1 + - Modules/getpath.py | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Modules/getpath.c b/Modules/getpath.c -index 0a31000075..b0efef2f53 100644 ---- a/Modules/getpath.c -+++ b/Modules/getpath.c -@@ -899,6 +899,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config) - !env_to_dict(dict, "ENV_PATH", 0) || - !env_to_dict(dict, "ENV_PYTHONHOME", 0) || - !env_to_dict(dict, "ENV_PYTHONEXECUTABLE", 0) || -+ !env_to_dict(dict, "ENV_CONDA_PY_ALLOW_REG_PATHS", 0) || - !env_to_dict(dict, "ENV___PYVENV_LAUNCHER__", 1) || - !progname_to_dict(dict, "real_executable") || - !library_to_dict(dict, "library") || -diff --git a/Modules/getpath.py b/Modules/getpath.py -index 9913fcba49..15a06c7e44 100644 ---- a/Modules/getpath.py -+++ b/Modules/getpath.py -@@ -51,6 +51,7 @@ - # ENV_PYTHONHOME -- [in] getenv(...) - # ENV_PYTHONEXECUTABLE -- [in] getenv(...) - # ENV___PYVENV_LAUNCHER__ -- [in] getenv(...) -+# ENV_CONDA_PY_ALLOW_REG_PATHS -- [in] getenv(...) - - # ** Values calculated at runtime ** - # config -- [in/out] dict of the PyConfig structure -@@ -673,7 +674,7 @@ def search_up(prefix, *landmarks, test=isfile): - else: - pythonpath.append(joinpath(prefix, ZIP_LANDMARK)) - -- if os_name == 'nt' and use_environment and winreg: -+ if os_name == 'nt' and use_environment and winreg and ENV_CONDA_PY_ALLOW_REG_PATHS and ENV_CONDA_PY_ALLOW_REG_PATHS != '0': - # QUIRK: Windows also lists paths in the registry. Paths are stored - # as the default value of each subkey of - # {HKCU,HKLM}\Software\Python\PythonCore\{winver}\PythonPath diff --git a/recipe/patches/0005-Unvendor-openssl.patch b/recipe/patches/0005-Unvendor-openssl.patch deleted file mode 100644 index 11c730271..000000000 --- a/recipe/patches/0005-Unvendor-openssl.patch +++ /dev/null @@ -1,203 +0,0 @@ -From 91c6890e658e06e72213b8699e9c7e15ab42de55 Mon Sep 17 00:00:00 2001 -From: Nehal J Wani -Date: Sat, 24 Nov 2018 20:38:02 -0600 -Subject: [PATCH 05/22] Unvendor openssl - -Co-authored-by: Isuru Fernando ---- - PCbuild/_ssl.vcxproj | 3 -- - PCbuild/_ssl.vcxproj.filters | 3 -- - PCbuild/openssl.props | 14 ++------- - PCbuild/openssl.vcxproj | 56 ------------------------------------ - PCbuild/python.props | 11 +------ - PCbuild/python.vcxproj | 3 ++ - PCbuild/pythonw.vcxproj | 3 ++ - 7 files changed, 9 insertions(+), 84 deletions(-) - -diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index 226ff506f8..e2fac911e1 100644 ---- a/PCbuild/_ssl.vcxproj -+++ b/PCbuild/_ssl.vcxproj -@@ -99,9 +99,6 @@ - - - -- -- _CRT_SECURE_NO_WARNINGS;$(PreprocessorDefinitions) -- - - - -diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters -index 716a69a41a..8aef9e03fc 100644 ---- a/PCbuild/_ssl.vcxproj.filters -+++ b/PCbuild/_ssl.vcxproj.filters -@@ -12,9 +12,6 @@ - - Source Files - -- -- Source Files -- - - - -diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props -index 5fd708b211..044cefd95e 100644 ---- a/PCbuild/openssl.props -+++ b/PCbuild/openssl.props -@@ -2,10 +2,10 @@ - - - -- $(opensslIncludeDir);%(AdditionalIncludeDirectories) -+ $(condaDir)include;%(AdditionalIncludeDirectories) - - -- $(opensslOutDir);%(AdditionalLibraryDirectories) -+ $(condaDir)lib;%(AdditionalLibraryDirectories) - ws2_32.lib;libcrypto.lib;libssl.lib;%(AdditionalDependencies) - - -@@ -21,14 +21,4 @@ - <_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).dll" /> - <_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).pdb" /> - -- -- -- -- -- -- - -diff --git a/PCbuild/openssl.vcxproj b/PCbuild/openssl.vcxproj -index 0da6f67495..17eee400eb 100644 ---- a/PCbuild/openssl.vcxproj -+++ b/PCbuild/openssl.vcxproj -@@ -60,64 +60,8 @@ - - - -- -- $(opensslDir)\tmp$(Bitness)dll -- $(opensslOutDir) -- setlocal --set VCINSTALLDIR=$(VCInstallDir) --if not exist "$(IntDir.TrimEnd('\'))" mkdir "$(IntDir.TrimEnd('\'))" --cd /D "$(IntDir.TrimEnd('\'))" --$(Perl) "$(opensslDir)\configure" $(OpenSSLPlatform) no-asm --nmake -- -- -- - - -- -- -- $(opensslDir)\ms\uplink.c -- ((h = GetModuleHandle(NULL)) == NULL) -- ((h = GetModuleHandleA("_ssl.pyd")) == NULL) if ((h = GetModuleHandleA("_ssl_d.pyd")) == NULL) if ((h = GetModuleHandle(NULL)) == NULL /*patched*/) -- -- -- -- <_Original>$([System.IO.File]::ReadAllText($(Uplink))) -- <_Patched>$(_Original.Replace($(BeforePatch), $(AfterPatch))) -- false -- true -- -- -- -- -- -- -- -- -- <_Built Include="$(opensslDir)\LICENSE" /> -- <_Built Include="$(IntDir)\libcrypto.lib;$(IntDir)\libcrypto-*.dll;$(IntDir)\libcrypto-*.pdb" /> -- <_Built Include="$(IntDir)\libssl.lib;$(IntDir)\libssl-*.dll;$(IntDir)\libssl-*.pdb" /> -- <_AppLink Include="$(opensslDir)\ms\applink.c" /> -- <_Include Include="$(opensslDir)\Include\openssl\*.h" /> -- <_Include Include="$(IntDir)\include\openssl\*.h" /> -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -diff --git a/PCbuild/python.props b/PCbuild/python.props -index d799948fa3..cf0913f331 100644 ---- a/PCbuild/python.props -+++ b/PCbuild/python.props -@@ -61,6 +61,7 @@ - - - $(EXTERNALS_DIR) -+ $(LIBRARY_PREFIX)\ - $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`)) - $(ExternalsDir)\ - -@@ -68,17 +69,7 @@ - - - -- $(ExternalsDir)sqlite-3.45.3.0\ -- $(ExternalsDir)bzip2-1.0.8\ -- $(ExternalsDir)xz-5.2.5\ -- $(ExternalsDir)libffi-3.4.4\ -- $(libffiDir)$(ArchName)\ -- $(libffiOutDir)include -- $(ExternalsDir)openssl-3.0.13\ -- $(ExternalsDir)openssl-bin-3.0.13\$(ArchName)\ -- $(opensslOutDir)include - $(ExternalsDir)\nasm-2.11.06\ -- $(ExternalsDir)\zlib-1.3.1\ - - - -diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 846c87fd1a..8021002c16 100644 ---- a/PCbuild/python.vcxproj -+++ b/PCbuild/python.vcxproj -@@ -107,6 +107,9 @@ - - - -+ -+ _CRT_SECURE_NO_WARNINGS;$(PreprocessorDefinitions) -+ - - - -diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index f485352f64..38a2547089 100644 ---- a/PCbuild/pythonw.vcxproj -+++ b/PCbuild/pythonw.vcxproj -@@ -99,6 +99,9 @@ - - - -+ -+ _CRT_SECURE_NO_WARNINGS;$(PreprocessorDefinitions) -+ - - - diff --git a/recipe/patches/0006-Unvendor-sqlite3.patch b/recipe/patches/0006-Unvendor-sqlite3.patch deleted file mode 100644 index 13ca0de77..000000000 --- a/recipe/patches/0006-Unvendor-sqlite3.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 0a0c280aec453af0a3904a696dfc71175e6dc246 Mon Sep 17 00:00:00 2001 -From: Nehal J Wani -Date: Tue, 5 Oct 2021 12:42:06 -0700 -Subject: [PATCH 06/22] Unvendor sqlite3 - ---- - PCbuild/_sqlite3.vcxproj | 11 +++++------ - PCbuild/pcbuild.sln | 2 -- - PCbuild/sqlite3.vcxproj | 12 ++++++------ - 3 files changed, 11 insertions(+), 14 deletions(-) - -diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj -index 57c7413671..4735477f00 100644 ---- a/PCbuild/_sqlite3.vcxproj -+++ b/PCbuild/_sqlite3.vcxproj -@@ -93,9 +93,12 @@ - - - -- $(sqlite3Dir);%(AdditionalIncludeDirectories) -+ $(condaDir)\include;%(AdditionalIncludeDirectories) - PY_SQLITE_HAVE_SERIALIZE;PY_SQLITE_ENABLE_LOAD_EXTENSION;%(PreprocessorDefinitions) - -+ -+ $(condaDir)\lib\sqlite3.lib;%(AdditionalDependencies) -+ - - - -@@ -127,12 +130,8 @@ - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - -- -- {a1a295e5-463c-437f-81ca-1f32367685da} -- false -- - - - - -- -\ No newline at end of file -+ -diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln -index bdddec60da..ab43b610a9 100644 ---- a/PCbuild/pcbuild.sln -+++ b/PCbuild/pcbuild.sln -@@ -99,8 +99,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj" - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcxproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcxproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}" -diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj -index c502d51833..c1ff0c9a08 100644 ---- a/PCbuild/sqlite3.vcxproj -+++ b/PCbuild/sqlite3.vcxproj -@@ -88,12 +88,12 @@ - - - <_ProjectFileVersion>10.0.30319.1 -- <_SqliteVersion>$([System.Text.RegularExpressions.Regex]::Match(`$(sqlite3Dir)`, `((\d+)\.(\d+)\.(\d+)\.(\d+))\\?$`).Groups) -- $(_SqliteVersion.Split(`;`)[1]) -- $(_SqliteVersion.Split(`;`)[2]) -- $(_SqliteVersion.Split(`;`)[3]) -- $(_SqliteVersion.Split(`;`)[4]) -- $(_SqliteVersion.Split(`;`)[5]) -+ <_SqliteVersion>$(SQLITE3_VERSION) -+ $(_SqliteVersion) -+ $(_SqliteVersion.Split(`.`)[1]) -+ $(_SqliteVersion.Split(`.`)[2]) -+ $(_SqliteVersion.Split(`.`)[3]) -+ $(_SqliteVersion.Split(`.`)[4]) - - - diff --git a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch deleted file mode 100644 index 2df358864..000000000 --- a/recipe/patches/0007-Add-CondaEcosystemModifyDllSearchPath.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 46d9b400457bec18d25f3977758daa76d53acbf4 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Tue, 24 Dec 2019 18:37:17 +0100 -Subject: [PATCH 07/22] Add CondaEcosystemModifyDllSearchPath() - - The python interpreter is modifed so that it works as if the python interpreter - was called with the following conda directories. - - os.add_dll_directory(join(sys.prefix, 'bin')) - os.add_dll_directory(join(sys.prefix, 'Scripts')) - os.add_dll_directory(join(sys.prefix, 'Library', 'bin')) - os.add_dll_directory(join(sys.prefix, 'Library', 'usr', 'bin')) - os.add_dll_directory(join(sys.prefix, 'Library', 'mingw-w64', 'bin')) - - Search order - - The directory that contains the DLL (if looking for a dependency) - - Application (python.exe) directory - - Directories added with os.add_dll_directory - - The 5 conda directories - - C:\Windows\System32 - - Note that the default behaviour changed in conda python 3.10 to - make os.add_dll_directory work in user code. - - Note that in conda python <3.11, there was an option - CONDA_DLL_SEARCH_MODIFICATION=1 to add directories in PATH to the search - order, but this was deprecated in 3.10 and removed in 3.11 in favour of using - AddDllDirectory - -Co-authored-by: Isuru Fernando ---- - Python/pylifecycle.c | 96 ++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 96 insertions(+) - -diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index 2c36527a87..84cbae8248 100644 ---- a/Python/pylifecycle.c -+++ b/Python/pylifecycle.c -@@ -51,6 +51,10 @@ - - #ifdef MS_WINDOWS - # undef BYTE -+# include -+# include -+# include -+# include - #endif - - #define PUTS(fd, str) _Py_write_noraise(fd, str, (int)strlen(str)) -@@ -98,6 +102,94 @@ __attribute__ ((section (".PyRuntime"))) - = _PyRuntimeState_INIT(_PyRuntime); - _Py_COMP_DIAG_POP - -+#ifdef MS_WINDOWS -+/* -+ This function will modify the DLL search path so that /Library\bin -+ and other conda PATHS are added to the front of the DLL search path. -+*/ -+ -+#if !defined(LOAD_LIBRARY_SEARCH_DEFAULT_DIRS) -+#define LOAD_LIBRARY_SEARCH_DEFAULT_DIRS 0x00001000 -+#endif -+ -+typedef void (WINAPI *ADD)(PCWSTR NewDirectory); -+static ADD pAddDllDirectory = NULL; -+typedef struct -+{ -+ wchar_t *p_relative; -+ wchar_t *p_name; -+} CONDA_PATH; -+ -+#define NUM_CONDA_PATHS 5 -+ -+static CONDA_PATH condaPaths[NUM_CONDA_PATHS] = -+{ -+ {L"Library\\mingw-w64\\bin", NULL}, -+ {L"Library\\usr\\bin", NULL}, -+ {L"Library\\bin", NULL}, -+ {L"Scripts", NULL}, -+ {L"bin", NULL} -+}; -+static wchar_t sv_dll_dirname[1024]; -+ -+int CondaEcosystemModifyDllSearchPath_Init() -+{ -+ int debug_it = _wgetenv(L"CONDA_DLL_SEARCH_MODIFICATION_DEBUG") ? 1 : 0; -+ wchar_t* enable = _wgetenv(L"CONDA_DLL_SEARCH_MODIFICATION_ENABLE"); -+ int res = 0; -+ long long j; -+ CONDA_PATH *p_conda_path; -+ HMODULE dll_handle = NULL; -+ -+ if (pAddDllDirectory == NULL) -+ { -+ pAddDllDirectory = (ADD)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "AddDllDirectory"); -+ -+ /* Determine sv_dll_dirname */ -+ if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, -+ (LPCSTR) &CondaEcosystemModifyDllSearchPath_Init, &dll_handle) == 0) -+ { -+ // Getting the pythonxx.dll path failed. Fall back to relative path of python.exe -+ // assuming that the executable that is running this code is python.exe -+ dll_handle = NULL; -+ } -+ GetModuleFileNameW(dll_handle, &sv_dll_dirname[0], sizeof(sv_dll_dirname)/sizeof(sv_dll_dirname[0])-1); -+ sv_dll_dirname[sizeof(sv_dll_dirname)/sizeof(sv_dll_dirname[0])-1] = L'\0'; -+ if (wcsrchr(sv_dll_dirname, L'\\')) -+ *wcsrchr(sv_dll_dirname, L'\\') = L'\0'; -+ -+ for (p_conda_path = &condaPaths[0]; p_conda_path < &condaPaths[NUM_CONDA_PATHS]; ++p_conda_path) -+ { -+ size_t n_chars_dll_dirname = wcslen(sv_dll_dirname); -+ size_t n_chars_p_relative = wcslen(p_conda_path->p_relative); -+ p_conda_path->p_name = malloc(sizeof(wchar_t) * (n_chars_dll_dirname + n_chars_p_relative + 2)); -+ wcsncpy(p_conda_path->p_name, sv_dll_dirname, n_chars_dll_dirname+1); -+ wcsncat(p_conda_path->p_name, L"\\", 2); -+ wcsncat(p_conda_path->p_name, p_conda_path->p_relative, n_chars_p_relative+1); -+ } -+ -+ } -+ -+ if (pAddDllDirectory == NULL) -+ { -+ if (debug_it) -+ fwprintf(stderr, L"CondaEcosystemModifyDllSearchPath() :: WARNING :: Please install KB2533623 from http://go.microsoft.com/fwlink/p/?linkid=217865\n"\ -+ L"CondaEcosystemModifyDllSearchPath() :: WARNING :: to improve conda ecosystem DLL isolation"); -+ res = 2; -+ } -+ else { -+ for (j = NUM_CONDA_PATHS-1, p_conda_path = &condaPaths[NUM_CONDA_PATHS-1]; j > -1; --j, --p_conda_path) -+ { -+ if (debug_it) -+ fwprintf(stderr, L"CondaEcosystemModifyDllSearchPath() :: AddDllDirectory(%ls - ExePrefix)\n", p_conda_path->p_name); -+ pAddDllDirectory(p_conda_path->p_name); -+ } -+ } -+ return res; -+} -+ -+#endif -+ - static int runtime_initialized = 0; - - PyStatus -@@ -114,6 +206,10 @@ _PyRuntime_Initialize(void) - } - runtime_initialized = 1; - -+#ifdef MS_WINDOWS -+ extern int CondaEcosystemModifyDllSearchPath_Init(); -+ CondaEcosystemModifyDllSearchPath_Init(); -+#endif - return _PyRuntimeState_Init(&_PyRuntime); - } - diff --git a/recipe/patches/0008-Doing-d1trimfile.patch b/recipe/patches/0008-Doing-d1trimfile.patch deleted file mode 100644 index 8b012444c..000000000 --- a/recipe/patches/0008-Doing-d1trimfile.patch +++ /dev/null @@ -1,880 +0,0 @@ -From 679e1d26a2d1883952ef98d191cc08242adcab12 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Tue, 31 Dec 2019 21:47:47 +0100 -Subject: [PATCH 08/22] Doing d1trimfile - ---- - PCbuild/_asyncio.vcxproj | 20 ++++++++++++++++++++ - PCbuild/_bz2.vcxproj | 4 ++++ - PCbuild/_ctypes.vcxproj | 4 ++++ - PCbuild/_ctypes_test.vcxproj | 20 ++++++++++++++++++++ - PCbuild/_decimal.vcxproj | 4 ++++ - PCbuild/_elementtree.vcxproj | 6 +++++- - PCbuild/_freeze_module.vcxproj | 4 ++++ - PCbuild/_hashlib.vcxproj | 12 ++++++++++++ - PCbuild/_lzma.vcxproj | 4 ++++ - PCbuild/_msi.vcxproj | 12 ++++++++++++ - PCbuild/_multiprocessing.vcxproj | 12 ++++++++++++ - PCbuild/_overlapped.vcxproj | 12 ++++++++++++ - PCbuild/_queue.vcxproj | 20 ++++++++++++++++++++ - PCbuild/_socket.vcxproj | 12 ++++++++++++ - PCbuild/_sqlite3.vcxproj | 4 ++++ - PCbuild/_ssl.vcxproj | 12 ++++++++++++ - PCbuild/_testbuffer.vcxproj | 20 ++++++++++++++++++++ - PCbuild/_testcapi.vcxproj | 20 ++++++++++++++++++++ - PCbuild/_testconsole.vcxproj | 4 ++++ - PCbuild/_testembed.vcxproj | 4 ++++ - PCbuild/_testimportmultiple.vcxproj | 20 ++++++++++++++++++++ - PCbuild/_testinternalcapi.vcxproj | 20 ++++++++++++++++++++ - PCbuild/_testmultiphase.vcxproj | 4 ++++ - PCbuild/_tkinter.vcxproj | 4 ++++ - PCbuild/liblzma.vcxproj | 4 ++++ - PCbuild/pyexpat.vcxproj | 4 ++++ - PCbuild/pylauncher.vcxproj | 4 ++++ - PCbuild/pyshellext.vcxproj | 4 ++++ - PCbuild/python.vcxproj | 4 ++++ - PCbuild/python3dll.vcxproj | 4 ++++ - PCbuild/python_uwp.vcxproj | 2 +- - PCbuild/pythoncore.vcxproj | 2 +- - PCbuild/pythonw.vcxproj | 12 ++++++++++++ - PCbuild/pythonw_uwp.vcxproj | 2 +- - PCbuild/pywlauncher.vcxproj | 4 ++++ - PCbuild/select.vcxproj | 12 ++++++++++++ - PCbuild/unicodedata.vcxproj | 20 ++++++++++++++++++++ - PCbuild/venvlauncher.vcxproj | 4 ++++ - PCbuild/venvwlauncher.vcxproj | 4 ++++ - PCbuild/winsound.vcxproj | 12 ++++++++++++ - PCbuild/xxlimited.vcxproj | 6 ++++++ - PCbuild/xxlimited_35.vcxproj | 6 ++++++ - 42 files changed, 364 insertions(+), 4 deletions(-) - -diff --git a/PCbuild/_asyncio.vcxproj b/PCbuild/_asyncio.vcxproj -index ed1e1bc0a4..47d322be5f 100644 ---- a/PCbuild/_asyncio.vcxproj -+++ b/PCbuild/_asyncio.vcxproj -@@ -91,6 +91,26 @@ - - <_ProjectFileVersion>10.0.30319.1 - -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ - - - -diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj -index 3fe95fbf83..0402f7a9aa 100644 ---- a/PCbuild/_bz2.vcxproj -+++ b/PCbuild/_bz2.vcxproj -@@ -97,6 +97,10 @@ - $(bz2Dir);%(AdditionalIncludeDirectories) - WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - 4244;4267;%(DisableSpecificWarnings) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - -diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj -index 253da31e9c..9e85bd9723 100644 ---- a/PCbuild/_ctypes.vcxproj -+++ b/PCbuild/_ctypes.vcxproj -@@ -95,6 +95,10 @@ - - - USING_MALLOC_CLOSURE_DOT_C=1;%(PreprocessorDefinitions) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) -diff --git a/PCbuild/_ctypes_test.vcxproj b/PCbuild/_ctypes_test.vcxproj -index 8a01e743a4..1ad658d5f9 100644 ---- a/PCbuild/_ctypes_test.vcxproj -+++ b/PCbuild/_ctypes_test.vcxproj -@@ -92,6 +92,26 @@ - - <_ProjectFileVersion>10.0.30319.1 - -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ - - - -diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj -index 0916f1a2d3..17a4cbfcd7 100644 ---- a/PCbuild/_decimal.vcxproj -+++ b/PCbuild/_decimal.vcxproj -@@ -99,6 +99,10 @@ - CONFIG_64;ANSI;%(PreprocessorDefinitions) - CONFIG_64;MASM;%(PreprocessorDefinitions) - ..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - -diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 8da5244bac..20cc09d63f 100644 ---- a/PCbuild/_elementtree.vcxproj -+++ b/PCbuild/_elementtree.vcxproj -@@ -94,7 +94,11 @@ - - - ..\Modules\expat;%(AdditionalIncludeDirectories) -- _CRT_SECURE_NO_WARNINGS;XML_STATIC;%(PreprocessorDefinitions) -+ _CRT_SECURE_NO_WARNINGS;USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - -diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj -index 3df0a07204..26982e0ceb 100644 ---- a/PCbuild/_freeze_module.vcxproj -+++ b/PCbuild/_freeze_module.vcxproj -@@ -91,6 +91,10 @@ - Py_NO_ENABLE_SHARED;Py_BUILD_CORE;_CONSOLE;%(PreprocessorDefinitions) - Disabled - false -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - Console -diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj -index 6dad8183c5..6d3d37fdf9 100644 ---- a/PCbuild/_hashlib.vcxproj -+++ b/PCbuild/_hashlib.vcxproj -@@ -96,6 +96,18 @@ - - ws2_32.lib;%(AdditionalDependencies) - -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ - - - -diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj -index fe076a6fc5..0565132363 100644 ---- a/PCbuild/_lzma.vcxproj -+++ b/PCbuild/_lzma.vcxproj -@@ -95,6 +95,10 @@ - - $(lzmaDir)src/liblzma/api;%(AdditionalIncludeDirectories) - WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - $(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies) -diff --git a/PCbuild/_msi.vcxproj b/PCbuild/_msi.vcxproj -index 720eb2931b..247ab0e915 100644 ---- a/PCbuild/_msi.vcxproj -+++ b/PCbuild/_msi.vcxproj -@@ -96,6 +96,18 @@ - - cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies) - -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ - - - -diff --git a/PCbuild/_multiprocessing.vcxproj b/PCbuild/_multiprocessing.vcxproj -index 77b6bfc8e1..3c2b651549 100644 ---- a/PCbuild/_multiprocessing.vcxproj -+++ b/PCbuild/_multiprocessing.vcxproj -@@ -95,6 +95,18 @@ - - ws2_32.lib;%(AdditionalDependencies) - -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ - - - -diff --git a/PCbuild/_overlapped.vcxproj b/PCbuild/_overlapped.vcxproj -index 9e60d3b5db..95b57290f8 100644 ---- a/PCbuild/_overlapped.vcxproj -+++ b/PCbuild/_overlapped.vcxproj -@@ -95,6 +95,18 @@ - - ws2_32.lib;%(AdditionalDependencies) - -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ - - - -diff --git a/PCbuild/_queue.vcxproj b/PCbuild/_queue.vcxproj -index 8065b23585..e46ab5a83b 100644 ---- a/PCbuild/_queue.vcxproj -+++ b/PCbuild/_queue.vcxproj -@@ -91,6 +91,26 @@ - - <_ProjectFileVersion>10.0.30319.1 - -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ - - - -diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj -index 78fa4d6729..be19cf1dca 100644 ---- a/PCbuild/_socket.vcxproj -+++ b/PCbuild/_socket.vcxproj -@@ -95,6 +95,18 @@ - - ws2_32.lib;iphlpapi.lib;Rpcrt4.lib;%(AdditionalDependencies) - -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ - - - -diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj -index 4735477f00..c7c377e217 100644 ---- a/PCbuild/_sqlite3.vcxproj -+++ b/PCbuild/_sqlite3.vcxproj -@@ -95,6 +95,10 @@ - - $(condaDir)\include;%(AdditionalIncludeDirectories) - PY_SQLITE_HAVE_SERIALIZE;PY_SQLITE_ENABLE_LOAD_EXTENSION;%(PreprocessorDefinitions) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - $(condaDir)\lib\sqlite3.lib;%(AdditionalDependencies) -diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index e2fac911e1..5c1ae2fce2 100644 ---- a/PCbuild/_ssl.vcxproj -+++ b/PCbuild/_ssl.vcxproj -@@ -96,6 +96,18 @@ - - ws2_32.lib;crypt32.lib;%(AdditionalDependencies) - -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ - - - -diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj -index 917d7ae50f..8c7e141eea 100644 ---- a/PCbuild/_testbuffer.vcxproj -+++ b/PCbuild/_testbuffer.vcxproj -@@ -92,6 +92,26 @@ - - <_ProjectFileVersion>10.0.40219.1 - -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ - - - -diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj -index 257562c75d..41bd3cc56c 100644 ---- a/PCbuild/_testcapi.vcxproj -+++ b/PCbuild/_testcapi.vcxproj -@@ -92,6 +92,26 @@ - - <_ProjectFileVersion>10.0.30319.1 - -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ - - - -diff --git a/PCbuild/_testconsole.vcxproj b/PCbuild/_testconsole.vcxproj -index 5d7e14eff1..695dcb3b91 100644 ---- a/PCbuild/_testconsole.vcxproj -+++ b/PCbuild/_testconsole.vcxproj -@@ -92,6 +92,10 @@ - - - _CONSOLE;%(PreprocessorDefinitions) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - Console -diff --git a/PCbuild/_testembed.vcxproj b/PCbuild/_testembed.vcxproj -index a7ea8787e0..eab72171e3 100644 ---- a/PCbuild/_testembed.vcxproj -+++ b/PCbuild/_testembed.vcxproj -@@ -89,6 +89,10 @@ - - - _CONSOLE;%(PreprocessorDefinitions) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - Console -diff --git a/PCbuild/_testimportmultiple.vcxproj b/PCbuild/_testimportmultiple.vcxproj -index 6d80d5779f..951bf40e7c 100644 ---- a/PCbuild/_testimportmultiple.vcxproj -+++ b/PCbuild/_testimportmultiple.vcxproj -@@ -92,6 +92,26 @@ - - <_ProjectFileVersion>10.0.30319.1 - -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ - - - -diff --git a/PCbuild/_testinternalcapi.vcxproj b/PCbuild/_testinternalcapi.vcxproj -index 6c5b12cd40..d25c774913 100644 ---- a/PCbuild/_testinternalcapi.vcxproj -+++ b/PCbuild/_testinternalcapi.vcxproj -@@ -92,6 +92,26 @@ - - <_ProjectFileVersion>10.0.30319.1 - -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ - - - -diff --git a/PCbuild/_testmultiphase.vcxproj b/PCbuild/_testmultiphase.vcxproj -index 430eb528cc..7a268d227b 100644 ---- a/PCbuild/_testmultiphase.vcxproj -+++ b/PCbuild/_testmultiphase.vcxproj -@@ -92,6 +92,10 @@ - - - _CONSOLE;%(PreprocessorDefinitions) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - Console -diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj -index 30cedcbb43..0484a5c81f 100644 ---- a/PCbuild/_tkinter.vcxproj -+++ b/PCbuild/_tkinter.vcxproj -@@ -96,6 +96,10 @@ - $(tcltkDir)include;%(AdditionalIncludeDirectories) - WITH_APPINIT;%(PreprocessorDefinitions) - Py_TCLTK_DIR="$(tcltkDir.TrimEnd('\').Replace('\', '\\'))";%(PreprocessorDefinitions) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - $(tcltkLib);%(AdditionalDependencies) -diff --git a/PCbuild/liblzma.vcxproj b/PCbuild/liblzma.vcxproj -index 4dd42ab98a..7c2dbc7e70 100644 ---- a/PCbuild/liblzma.vcxproj -+++ b/PCbuild/liblzma.vcxproj -@@ -94,6 +94,10 @@ - WIN32;HAVE_CONFIG_H;_LIB;%(PreprocessorDefinitions) - $(lzmaDir)windows/vs2019;$(lzmaDir)src/liblzma/common;$(lzmaDir)src/common;$(lzmaDir)src/liblzma/api;$(lzmaDir)src/liblzma/check;$(lzmaDir)src/liblzma/delta;$(lzmaDir)src/liblzma/lz;$(lzmaDir)src/liblzma/lzma;$(lzmaDir)src/liblzma/rangecoder;$(lzmaDir)src/liblzma/simple;%(AdditionalIncludeDirectories) - 4028;4113;4133;4244;4267;4996;%(DisableSpecificWarnings) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - -diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 001f8afd89..3be4ac06dd 100644 ---- a/PCbuild/pyexpat.vcxproj -+++ b/PCbuild/pyexpat.vcxproj -@@ -92,6 +92,10 @@ - - $(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - -diff --git a/PCbuild/pylauncher.vcxproj b/PCbuild/pylauncher.vcxproj -index 35f2f7e505..02d7961c5d 100644 ---- a/PCbuild/pylauncher.vcxproj -+++ b/PCbuild/pylauncher.vcxproj -@@ -93,6 +93,10 @@ - - _CONSOLE;%(PreprocessorDefinitions) - MultiThreaded -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - shell32.lib;pathcch.lib;%(AdditionalDependencies) -diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj -index ea432d6bc9..13bc692103 100644 ---- a/PCbuild/pyshellext.vcxproj -+++ b/PCbuild/pyshellext.vcxproj -@@ -92,6 +92,10 @@ - - - _CONSOLE;%(PreprocessorDefinitions) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - version.lib;shlwapi.lib;%(AdditionalDependencies) -diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 8021002c16..9eb3f36940 100644 ---- a/PCbuild/python.vcxproj -+++ b/PCbuild/python.vcxproj -@@ -91,6 +91,10 @@ - - - Py_BUILD_CORE;_CONSOLE;%(PreprocessorDefinitions) -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - Console -diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj -index ec22e6fc76..80dff0a3d9 100644 ---- a/PCbuild/python3dll.vcxproj -+++ b/PCbuild/python3dll.vcxproj -@@ -93,6 +93,10 @@ - - PYTHON_DLL_NAME="$(PyDllName)";%(PreprocessorDefinitions) - false -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - true -diff --git a/PCbuild/python_uwp.vcxproj b/PCbuild/python_uwp.vcxproj -index fb27e9e712..f8dc841ef1 100644 ---- a/PCbuild/python_uwp.vcxproj -+++ b/PCbuild/python_uwp.vcxproj -@@ -90,7 +90,7 @@ - - - %(PreprocessorDefinitions) -- /EHsc /std:c++17 %(AdditionalOptions) -+ /d1trimfile:%SRC_DIR% - - - windowsapp.lib;%(AdditionalDependencies) -diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index b265264dc1..9390c4d7d7 100644 ---- a/PCbuild/pythoncore.vcxproj -+++ b/PCbuild/pythoncore.vcxproj -@@ -99,7 +99,7 @@ - - - -- /Zm200 %(AdditionalOptions) -+ /d1trimfile:%SRC_DIR% - $(PySourcePath)Modules\_hacl\include;$(PySourcePath)Modules\_hacl\internal;$(PySourcePath)Python;%(AdditionalIncludeDirectories) - $(zlibDir);%(AdditionalIncludeDirectories) - _USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions) -diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index 38a2547089..0b05df346e 100644 ---- a/PCbuild/pythonw.vcxproj -+++ b/PCbuild/pythonw.vcxproj -@@ -93,6 +93,18 @@ - 8000000 - 8000000 - -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ - - - -diff --git a/PCbuild/pythonw_uwp.vcxproj b/PCbuild/pythonw_uwp.vcxproj -index e21e46a1b7..ff7dc6635d 100644 ---- a/PCbuild/pythonw_uwp.vcxproj -+++ b/PCbuild/pythonw_uwp.vcxproj -@@ -90,7 +90,7 @@ - - - PYTHONW;%(PreprocessorDefinitions) -- /EHsc /std:c++17 %(AdditionalOptions) -+ /d1trimfile:%SRC_DIR% - - - windowsapp.lib;%(AdditionalDependencies) -diff --git a/PCbuild/pywlauncher.vcxproj b/PCbuild/pywlauncher.vcxproj -index e50b69aefe..3aa738bb7f 100644 ---- a/PCbuild/pywlauncher.vcxproj -+++ b/PCbuild/pywlauncher.vcxproj -@@ -93,6 +93,10 @@ - - _WINDOWS;%(PreprocessorDefinitions) - MultiThreaded -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - shell32.lib;pathcch.lib;%(AdditionalDependencies) -diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj -index 750a713949..1da66eaddc 100644 ---- a/PCbuild/select.vcxproj -+++ b/PCbuild/select.vcxproj -@@ -94,6 +94,18 @@ - - ws2_32.lib;%(AdditionalDependencies) - -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ - - - -diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj -index addef75335..1a13f363e2 100644 ---- a/PCbuild/unicodedata.vcxproj -+++ b/PCbuild/unicodedata.vcxproj -@@ -91,6 +91,26 @@ - - <_ProjectFileVersion>10.0.30319.1 - -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ - - - -diff --git a/PCbuild/venvlauncher.vcxproj b/PCbuild/venvlauncher.vcxproj -index 123e84ec4e..6272f9f69d 100644 ---- a/PCbuild/venvlauncher.vcxproj -+++ b/PCbuild/venvlauncher.vcxproj -@@ -93,6 +93,10 @@ - - _CONSOLE;VENV_REDIRECT;%(PreprocessorDefinitions) - MultiThreaded -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - PY_ICON;%(PreprocessorDefinitions) -diff --git a/PCbuild/venvwlauncher.vcxproj b/PCbuild/venvwlauncher.vcxproj -index b8504d5d08..60d6308713 100644 ---- a/PCbuild/venvwlauncher.vcxproj -+++ b/PCbuild/venvwlauncher.vcxproj -@@ -93,6 +93,10 @@ - - _WINDOWS;VENV_REDIRECT;%(PreprocessorDefinitions) - MultiThreaded -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% - - - PYW_ICON;%(PreprocessorDefinitions) -diff --git a/PCbuild/winsound.vcxproj b/PCbuild/winsound.vcxproj -index 32cedc9b44..c9abee1d69 100644 ---- a/PCbuild/winsound.vcxproj -+++ b/PCbuild/winsound.vcxproj -@@ -96,6 +96,18 @@ - - winmm.lib;%(AdditionalDependencies) - -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ -+ -+ /d1trimfile:%SRC_DIR% -+ - - - -diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj -index 1c776fb0da..36dec23c20 100644 ---- a/PCbuild/xxlimited.vcxproj -+++ b/PCbuild/xxlimited.vcxproj -@@ -93,6 +93,12 @@ - <_ProjectFileVersion>10.0.30319.1 - - -+ -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ - - wsock32.lib;%(AdditionalDependencies) - -diff --git a/PCbuild/xxlimited_35.vcxproj b/PCbuild/xxlimited_35.vcxproj -index dd830b3b6a..fef2c5b9f4 100644 ---- a/PCbuild/xxlimited_35.vcxproj -+++ b/PCbuild/xxlimited_35.vcxproj -@@ -93,6 +93,12 @@ - <_ProjectFileVersion>10.0.30319.1 - - -+ -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ /d1trimfile:%SRC_DIR% -+ - - wsock32.lib;%(AdditionalDependencies) - diff --git a/recipe/patches/0009-cross-compile-darwin.patch b/recipe/patches/0009-cross-compile-darwin.patch deleted file mode 100644 index 2ef8f8c09..000000000 --- a/recipe/patches/0009-cross-compile-darwin.patch +++ /dev/null @@ -1,78 +0,0 @@ -From fae08eb999d62039e0dbbeb65761f0e4c507c471 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Fri, 2 Oct 2020 00:03:12 +0200 -Subject: [PATCH 09/22] cross compile darwin - -By Isuru Fernando. ---- - Lib/platform.py | 7 ++++++- - configure | 6 ++++++ - configure.ac | 6 ++++++ - 3 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/Lib/platform.py b/Lib/platform.py -index c5b6048036..7470545466 100755 ---- a/Lib/platform.py -+++ b/Lib/platform.py -@@ -459,7 +459,12 @@ def win32_ver(release='', version='', csd='', ptype=''): - def _mac_ver_xml(): - fn = '/System/Library/CoreServices/SystemVersion.plist' - if not os.path.exists(fn): -- return None -+ if 'SDKROOT' in os.environ: -+ fn = os.environ['SDKROOT'] + fn -+ if not os.path.exists(fn): -+ return None -+ else: -+ return None - - try: - import plistlib -diff --git a/configure b/configure -index 6dc8a66e48..552597c021 100755 ---- a/configure -+++ b/configure -@@ -4267,6 +4267,9 @@ then - *-*-linux*) - ac_sys_system=Linux - ;; -+ *-*-darwin*) -+ ac_sys_system=Darwin -+ ;; - *-*-cygwin*) - ac_sys_system=Cygwin - ;; -@@ -4332,6 +4335,9 @@ if test "$cross_compiling" = yes; then - _host_cpu=$host_cpu - esac - ;; -+ *-*-darwin*) -+ _host_cpu=$host_cpu -+ ;; - *-*-cygwin*) - _host_cpu= - ;; -diff --git a/configure.ac b/configure.ac -index 8a32cb58f4..36b565af1b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -547,6 +547,9 @@ then - *-*-linux*) - ac_sys_system=Linux - ;; -+ *-*-darwin*) -+ ac_sys_system=Darwin -+ ;; - *-*-cygwin*) - ac_sys_system=Cygwin - ;; -@@ -610,6 +613,9 @@ if test "$cross_compiling" = yes; then - _host_cpu=$host_cpu - esac - ;; -+ *-*-darwin*) -+ _host_cpu=$host_cpu -+ ;; - *-*-cygwin*) - _host_cpu= - ;; diff --git a/recipe/patches/0010-Fix-TZPATH-on-windows.patch b/recipe/patches/0010-Fix-TZPATH-on-windows.patch deleted file mode 100644 index 1020b8573..000000000 --- a/recipe/patches/0010-Fix-TZPATH-on-windows.patch +++ /dev/null @@ -1,21 +0,0 @@ -From eaf0b19149ec28a231e0c73e36b2a6fdc29c250e Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Wed, 7 Oct 2020 10:08:30 -0500 -Subject: [PATCH 10/22] Fix TZPATH on windows - ---- - Lib/sysconfig.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 122d441bd1..8e1d823a4c 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py -@@ -666,6 +666,7 @@ def _init_config_vars(): - if os.name == 'nt': - _init_non_posix(_CONFIG_VARS) - _CONFIG_VARS['VPATH'] = sys._vpath -+ _CONFIG_VARS['TZPATH'] = os.path.join(_PREFIX, "share", "zoneinfo") - if os.name == 'posix': - _init_posix(_CONFIG_VARS) - if _HAS_USER_BASE: diff --git a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch b/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch deleted file mode 100644 index 8fafc58d7..000000000 --- a/recipe/patches/0011-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dfa56fb035e286513a96ab1ee60a438a61295aac Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Mon, 25 Jan 2021 03:28:08 -0600 -Subject: [PATCH 11/22] Make dyld search work with SYSTEM_VERSION_COMPAT=1 - -In macOS Big Sur, if the executable was compiled with `MACOSX_DEPLOYMENT_TARGET=10.15` -or below, then SYSTEM_VERSION_COMPAT=1 is the default which means that Big Sur -reports itself as 10.16 which means that `__builtin_available(macOS 11.0)` will not be triggered. - -This can be observed by using the python 3.9.1 universal2 installer and using it on -x86_64 Big Sur or with Rossetta 2 on arm64 Big Sur. (Not an issue with native arm64 -as that part is compiled with `MACOSX_DEPLOYMENT_TARGET=11.0`) ---- - Modules/_ctypes/callproc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c -index d2fe525dd4..62eaf1d889 100644 ---- a/Modules/_ctypes/callproc.c -+++ b/Modules/_ctypes/callproc.c -@@ -1460,7 +1460,7 @@ copy_com_pointer(PyObject *self, PyObject *args) - #ifdef HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH - # ifdef HAVE_BUILTIN_AVAILABLE - # define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \ -- __builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *) -+ __builtin_available(macOS 10.16, iOS 14.0, tvOS 14.0, watchOS 7.0, *) - # else - # define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH_RUNTIME \ - (_dyld_shared_cache_contains_path != NULL) diff --git a/recipe/patches/0012-Unvendor-bzip2.patch b/recipe/patches/0012-Unvendor-bzip2.patch deleted file mode 100644 index 23f0716de..000000000 --- a/recipe/patches/0012-Unvendor-bzip2.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 4cfee77c16d2985f27f61ed831027f18ad51a641 Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Mon, 16 Aug 2021 02:56:27 -0700 -Subject: [PATCH 12/22] Unvendor bzip2 - ---- - PCbuild/_bz2.vcxproj | 15 +++++---------- - PCbuild/_bz2.vcxproj.filters | 26 +------------------------- - 2 files changed, 6 insertions(+), 35 deletions(-) - -diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj -index 0402f7a9aa..569c7c5de9 100644 ---- a/PCbuild/_bz2.vcxproj -+++ b/PCbuild/_bz2.vcxproj -@@ -94,7 +94,7 @@ - - - -- $(bz2Dir);%(AdditionalIncludeDirectories) -+ $(condaDir)\include;%(AdditionalIncludeDirectories) - WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - 4244;4267;%(DisableSpecificWarnings) - /d1trimfile:%SRC_DIR% -@@ -102,20 +102,15 @@ - /d1trimfile:%SRC_DIR% - /d1trimfile:%SRC_DIR% - -+ -+ $(condaDir)\lib\bzip2.lib;%(AdditionalDependencies) -+ - - - -- -- -- -- -- -- -- - - -- -- -+ - - - -diff --git a/PCbuild/_bz2.vcxproj.filters b/PCbuild/_bz2.vcxproj.filters -index 7c0b516253..c1f960608c 100644 ---- a/PCbuild/_bz2.vcxproj.filters -+++ b/PCbuild/_bz2.vcxproj.filters -@@ -21,33 +21,9 @@ - - Source Files - -- -- Source Files\bzip2 -- -- -- Source Files\bzip2 -- -- -- Source Files\bzip2 -- -- -- Source Files\bzip2 -- -- -- Source Files\bzip2 -- -- -- Source Files\bzip2 -- -- -- Source Files\bzip2 -- - - -- -- Header Files\bzip2 -- -- -+ - Header Files\bzip2 - - diff --git a/recipe/patches/0013-Unvendor-libffi.patch b/recipe/patches/0013-Unvendor-libffi.patch deleted file mode 100644 index 3b921e6fa..000000000 --- a/recipe/patches/0013-Unvendor-libffi.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a346f51234b70e907c8bac4156e2f67f209ca380 Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Mon, 16 Aug 2021 03:07:40 -0700 -Subject: [PATCH 13/22] Unvendor libffi - ---- - PCbuild/libffi.props | 17 ++++------------- - 1 file changed, 4 insertions(+), 13 deletions(-) - -diff --git a/PCbuild/libffi.props b/PCbuild/libffi.props -index 22c9550e2c..40ddb08d2b 100644 ---- a/PCbuild/libffi.props -+++ b/PCbuild/libffi.props -@@ -2,20 +2,11 @@ - - - -- $(libffiIncludeDir);%(AdditionalIncludeDirectories) -+ $(condaDir)\include;%(AdditionalIncludeDirectories) - - -- $(libffiOutDir);%(AdditionalLibraryDirectories) -- libffi-8.lib;%(AdditionalDependencies) -+ $(condaDir)\lib;%(AdditionalLibraryDirectories) -+ ffi.lib;%(AdditionalDependencies) - - -- -- <_LIBFFIDLL Include="$(libffiOutDir)\libffi-8.dll" /> -- -- -- -- -- -- -- -- -\ No newline at end of file -+ diff --git a/recipe/patches/0014-Unvendor-tcltk.patch b/recipe/patches/0014-Unvendor-tcltk.patch deleted file mode 100644 index ae34ec8a0..000000000 --- a/recipe/patches/0014-Unvendor-tcltk.patch +++ /dev/null @@ -1,50 +0,0 @@ -From dcb96fc3a6604875421ad94654bad12424db494c Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Fri, 20 Aug 2021 10:23:51 -0700 -Subject: [PATCH 14/22] Unvendor tcltk - ---- - PCbuild/_tkinter.vcxproj | 6 ------ - PCbuild/tcltk.props | 12 +++++------- - 2 files changed, 5 insertions(+), 13 deletions(-) - -diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj -index 0484a5c81f..d1393c914d 100644 ---- a/PCbuild/_tkinter.vcxproj -+++ b/PCbuild/_tkinter.vcxproj -@@ -126,12 +126,6 @@ - - - -- -- -- -- -- -- - - - -diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props -index 9d5189b3b8..a8f5b8811c 100644 ---- a/PCbuild/tcltk.props -+++ b/PCbuild/tcltk.props -@@ -17,13 +17,11 @@ - $([System.Version]::Parse($(TixVersion)).Minor) - $([System.Version]::Parse($(TixVersion)).Build) - $([System.Version]::Parse($(TixVersion)).Revision) -- $(ExternalsDir)tcl-core-$(TclVersion)\ -- $(ExternalsDir)tk-$(TkVersion)\ -- $(ExternalsDir)tix-$(TixVersion)\ -- $(ExternalsDir)tcltk-$(TclVersion)\$(ArchName)\ -- $(tcltkDir)\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)t.exe -- $(tcltkDir)\..\win32\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)t.exe -- -+ $(condaDir) -+ $(condaDir) -+ $(condaDir) -+ $(condaDir) -+ $(condaDir)\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)t.exe - - tcl$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).dll - tcl$(TclMajorVersion)$(TclMinorVersion)t$(TclDebugExt).lib diff --git a/recipe/patches/0015-unvendor-xz.patch b/recipe/patches/0015-unvendor-xz.patch deleted file mode 100644 index bbb3882a8..000000000 --- a/recipe/patches/0015-unvendor-xz.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e2ef6df310bc7877332881ac140aab4d884a887e Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Sat, 25 Sep 2021 10:07:05 -0700 -Subject: [PATCH 15/22] unvendor xz - ---- - PCbuild/_lzma.vcxproj | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj -index 0565132363..e8b2704cee 100644 ---- a/PCbuild/_lzma.vcxproj -+++ b/PCbuild/_lzma.vcxproj -@@ -93,15 +93,15 @@ - - - -- $(lzmaDir)src/liblzma/api;%(AdditionalIncludeDirectories) -- WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions) -+ $(condaDir)\include;%(AdditionalIncludeDirectories) -+ WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - /d1trimfile:%SRC_DIR% - /d1trimfile:%SRC_DIR% - /d1trimfile:%SRC_DIR% - /d1trimfile:%SRC_DIR% - - -- $(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies) -+ $(condaDir)\lib\liblzma.lib;%(AdditionalDependencies) - - - -@@ -115,10 +115,6 @@ - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - -- -- {12728250-16eC-4dc6-94d7-e21dd88947f8} -- false -- - - - diff --git a/recipe/patches/0016-unvendor-zlib.patch b/recipe/patches/0016-unvendor-zlib.patch deleted file mode 100644 index d96dc9790..000000000 --- a/recipe/patches/0016-unvendor-zlib.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 91fcbab935cefba1855808e5b275d2b81b79d53a Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Wed, 29 Sep 2021 15:21:55 -0700 -Subject: [PATCH 16/22] unvendor zlib - ---- - PCbuild/pythoncore.vcxproj | 33 ++------------- - PCbuild/pythoncore.vcxproj.filters | 66 ------------------------------ - 2 files changed, 4 insertions(+), 95 deletions(-) - -diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj -index 9390c4d7d7..b36c48abb3 100644 ---- a/PCbuild/pythoncore.vcxproj -+++ b/PCbuild/pythoncore.vcxproj -@@ -82,7 +82,7 @@ - - true - true -- true -+ true - false - - -@@ -101,12 +101,13 @@ - - /d1trimfile:%SRC_DIR% - $(PySourcePath)Modules\_hacl\include;$(PySourcePath)Modules\_hacl\internal;$(PySourcePath)Python;%(AdditionalIncludeDirectories) -- $(zlibDir);%(AdditionalIncludeDirectories) -+ $(condaDir)\include;%(AdditionalIncludeDirectories) - _USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions) - _Py_HAVE_ZLIB;%(PreprocessorDefinitions) - - -- version.lib;ws2_32.lib;pathcch.lib;bcrypt.lib;%(AdditionalDependencies) -+ version.lib;ws2_32.lib;pathcch.lib;bcrypt.lib;zlib.lib;%(AdditionalDependencies) -+ $(condaDir)\lib;%(AdditionalLibraryDirectories) - - - -@@ -353,19 +354,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -577,19 +565,6 @@ - - - -- -- -- -- -- 4244 -- -- -- -- -- -- -- -- - - - -diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters -index 67a32f653d..9c064964b5 100644 ---- a/PCbuild/pythoncore.vcxproj.filters -+++ b/PCbuild/pythoncore.vcxproj.filters -@@ -717,39 +717,6 @@ - - Include\internal - -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- - - Include\internal - -@@ -1307,39 +1274,6 @@ - - Modules - -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- -- -- Modules\zlib -- - - Python - diff --git a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch deleted file mode 100644 index 266edb532..000000000 --- a/recipe/patches/0017-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7c7ce51dae3af7b8325e1ccdf8bcd7225b2b5065 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Wed, 16 Aug 2017 11:45:28 +0100 -Subject: [PATCH 17/22] Do not pass -g to GCC when not Py_DEBUG - -This bloats our exe and our modules a lot. ---- - configure | 6 +++--- - configure.ac | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 552597c021..cff40b9959 100755 ---- a/configure -+++ b/configure -@@ -5465,9 +5465,9 @@ if test $ac_test_CFLAGS; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then -- CFLAGS="-g -O2" -+ CFLAGS="-O2" - else -- CFLAGS="-g" -+ CFLAGS= - fi - else - if test "$GCC" = yes; then -@@ -9335,7 +9335,7 @@ then - if test "$Py_DEBUG" = 'true' ; then - OPT="-g $PYDEBUG_CFLAGS -Wall" - else -- OPT="-g -O3 -Wall" -+ OPT="-O3 -Wall" - fi - ;; - *) -diff --git a/configure.ac b/configure.ac -index 36b565af1b..538122985c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2255,7 +2255,7 @@ then - if test "$Py_DEBUG" = 'true' ; then - OPT="-g $PYDEBUG_CFLAGS -Wall" - else -- OPT="-g -O3 -Wall" -+ OPT="-O3 -Wall" - fi - ;; - *) diff --git a/recipe/patches/0018-Unvendor-expat.patch b/recipe/patches/0018-Unvendor-expat.patch deleted file mode 100644 index 60dde921a..000000000 --- a/recipe/patches/0018-Unvendor-expat.patch +++ /dev/null @@ -1,204 +0,0 @@ -From 578d46ad1930ab405cd908d8ec68368db36f0801 Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Wed, 29 Mar 2023 23:07:10 -0500 -Subject: [PATCH 18/22] Unvendor expat - ---- - PCbuild/_elementtree.vcxproj | 25 ++---------- - PCbuild/_elementtree.vcxproj.filters | 58 +--------------------------- - PCbuild/pyexpat.vcxproj | 12 ++---- - PCbuild/pyexpat.vcxproj.filters | 19 +-------- - 4 files changed, 10 insertions(+), 104 deletions(-) - -diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj -index 20cc09d63f..de476a6add 100644 ---- a/PCbuild/_elementtree.vcxproj -+++ b/PCbuild/_elementtree.vcxproj -@@ -93,36 +93,19 @@ - - - -- ..\Modules\expat;%(AdditionalIncludeDirectories) -+ $(condaDir)\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions) - /d1trimfile:%SRC_DIR% - /d1trimfile:%SRC_DIR% - /d1trimfile:%SRC_DIR% - /d1trimfile:%SRC_DIR% - -+ -+ $(condaDir)\lib\expat.lib;%(AdditionalDependencies) -+ - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - -- -- -- - - - -diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters -index bc14e31f32..7cc8e9a3b9 100644 ---- a/PCbuild/_elementtree.vcxproj.filters -+++ b/PCbuild/_elementtree.vcxproj.filters -@@ -17,70 +17,14 @@ - {f99990ba-cd06-40cc-8f28-d2d424ec13be} - - -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- -- Header Files\expat -- -- - - - Source Files - -- -- Source Files\expat -- -- -- Source Files\expat -- -- -- Source Files\expat -- - - - - Resource Files - - -- -\ No newline at end of file -+ -diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj -index 3be4ac06dd..e253b39c86 100644 ---- a/PCbuild/pyexpat.vcxproj -+++ b/PCbuild/pyexpat.vcxproj -@@ -90,23 +90,19 @@ - - - -- $(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories) -+ $(condaDir)\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions) - /d1trimfile:%SRC_DIR% - /d1trimfile:%SRC_DIR% - /d1trimfile:%SRC_DIR% - /d1trimfile:%SRC_DIR% - -+ -+ $(condaDir)\lib\expat.lib;%(AdditionalDependencies) -+ - -- -- -- -- - - -- -- -- - - - -diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters -index fd22fc8c47..41c73b434b 100644 ---- a/PCbuild/pyexpat.vcxproj.filters -+++ b/PCbuild/pyexpat.vcxproj.filters -@@ -11,31 +11,14 @@ - {f1dbbdb5-41e5-4a88-bf8e-13da010c0ce4} - - -- -- -- Header Files -- -- -- Header Files -- -- - - - Source Files - -- -- Source Files -- -- -- Source Files -- -- -- Source Files -- - - - - Resource Files - - -- -\ No newline at end of file -+ diff --git a/recipe/patches/0019-Remove-unused-readelf.patch b/recipe/patches/0019-Remove-unused-readelf.patch deleted file mode 100644 index 19a4e8827..000000000 --- a/recipe/patches/0019-Remove-unused-readelf.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fd9f5630ec6e354261274f5cb79501024197f3a1 Mon Sep 17 00:00:00 2001 -From: Charles Bousseau -Date: Thu, 25 May 2023 17:56:53 -0400 -Subject: [PATCH 19/22] Remove unused readelf - -readelf has been dropped. -.. date: 2022-11-02-10-56-40 -.. gh-issue: 98949 -.. nonce: 3SRD8C -.. section: Build - -Drop unused build dependency on ``readelf``. ---- - Makefile.pre.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4a957fb004..689ece9d24 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -38,7 +38,6 @@ CC= @CC@ - CXX= @CXX@ - LINKCC= @LINKCC@ - AR= @AR@ --READELF= @READELF@ - SOABI= @SOABI@ - LDVERSION= @LDVERSION@ - LIBPYTHON= @LIBPYTHON@ diff --git a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch b/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch deleted file mode 100644 index 450beeacf..000000000 --- a/recipe/patches/0020-Don-t-checksharedmods-if-cross-compiling.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 46ed1d097913ea6752125324ecf254a51e4927b4 Mon Sep 17 00:00:00 2001 -From: "Uwe L. Korn" -Date: Fri, 1 Sep 2023 23:32:14 +0200 -Subject: [PATCH 20/22] Don't checksharedmods if cross-compiling - ---- - Makefile.pre.in | 2 +- - if_runnable.sh | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - create mode 100755 if_runnable.sh - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 689ece9d24..913cbd8e23 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -994,7 +994,7 @@ sharedmods: $(SHAREDMODS) pybuilddir.txt - # dependency on BUILDPYTHON ensures that the target is run last - .PHONY: checksharedmods - checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) -- @$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py -+ @$(RUNSHARED) $(srcdir)/if_runnable.sh $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/check_extension_modules.py - - .PHONY: rundsymutil - rundsymutil: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON) -diff --git a/if_runnable.sh b/if_runnable.sh -new file mode 100755 -index 0000000000..14f84a8597 ---- /dev/null -+++ b/if_runnable.sh -@@ -0,0 +1,5 @@ -+#!/bin/bash -+ -+if [[ "${target_platform}" == "${build_platform}" || "${CROSSCOMPILING_EMULATOR:-}" != "" ]]; then -+ exec $* -+fi diff --git a/recipe/patches/0021-Override-configure-LIBFFI.patch b/recipe/patches/0021-Override-configure-LIBFFI.patch deleted file mode 100644 index 5934acc09..000000000 --- a/recipe/patches/0021-Override-configure-LIBFFI.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9278cac7fd97574e551bf989795d61381131ac97 Mon Sep 17 00:00:00 2001 -From: "Uwe L. Korn" -Date: Tue, 5 Sep 2023 21:51:31 +0200 -Subject: [PATCH 21/22] Override configure LIBFFI - ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index cff40b9959..50cbcc1ac7 100755 ---- a/configure -+++ b/configure -@@ -14095,7 +14095,7 @@ if test "x$ac_cv_lib_ffi_ffi_call" = xyes - then : - - have_libffi=yes -- LIBFFI_CFLAGS="-I${SDKROOT}/usr/include/ffi -DUSING_APPLE_OS_LIBFFI=1" -+ LIBFFI_CFLAGS="-I${PREFIX}/include -DUSING_APPLE_OS_LIBFFI=0" - LIBFFI_LIBS="-lffi" - - fi diff --git a/recipe/patches/0022-Allow-linking-ncursesw-panelw-on-macOS-if-available.patch b/recipe/patches/0022-Allow-linking-ncursesw-panelw-on-macOS-if-available.patch deleted file mode 100644 index 8b087e7b7..000000000 --- a/recipe/patches/0022-Allow-linking-ncursesw-panelw-on-macOS-if-available.patch +++ /dev/null @@ -1,85 +0,0 @@ -From bbc64a8ca9d69dbfd220a3924a71f7ea12cd43da Mon Sep 17 00:00:00 2001 -From: Marcel Bargull -Date: Thu, 14 Dec 2023 22:16:33 +0100 -Subject: [PATCH 22/22] Allow linking ncursesw/panelw on macOS if available - -Signed-off-by: Marcel Bargull ---- - configure | 4 ---- - configure.ac | 6 ------ - 2 files changed, 10 deletions(-) - -diff --git a/configure b/configure -index 50cbcc1ac7..0108f553bf 100755 ---- a/configure -+++ b/configure -@@ -25714,7 +25714,6 @@ fi - if test "x$ac_cv_header_ncurses_h" = xyes - then : - -- if test "$ac_sys_system" != "Darwin"; then - - pkg_failed=no - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ncursesw" >&5 -@@ -25910,7 +25909,6 @@ printf "%s\n" "yes" >&6; } - have_curses=ncursesw - - fi -- fi - - if test "x$have_curses" = xno - then : -@@ -26146,7 +26144,6 @@ if test "x$ac_cv_header_panel_h" = xyes - then : - - -- if test "$ac_sys_system" != "Darwin"; then - if test "x$have_curses" = xncursesw - then : - -@@ -26341,7 +26338,6 @@ printf "%s\n" "yes" >&6; } - fi - - fi -- fi - - if test "x$have_curses" = xncurses - then : -diff --git a/configure.ac b/configure.ac -index 538122985c..284c0daddd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -6432,8 +6432,6 @@ AH_TEMPLATE([HAVE_NCURSESW], [Define to 1 if you have the `ncursesw' library.]) - AC_CHECK_HEADERS([curses.h ncurses.h]) - - AS_VAR_IF([ac_cv_header_ncurses_h], [yes], [ -- if test "$ac_sys_system" != "Darwin"; then -- dnl On macOS, there is no separate /usr/lib/libncursesw nor libpanelw. - PKG_CHECK_MODULES([CURSES], [ncursesw], [ - AC_DEFINE([HAVE_NCURSESW], [1]) - have_curses=ncursesw -@@ -6447,7 +6445,6 @@ AS_VAR_IF([ac_cv_header_ncurses_h], [yes], [ - ]) - ]) - ]) -- fi - - AS_VAR_IF([have_curses], [no], [ - PKG_CHECK_MODULES([CURSES], [ncurses], [ -@@ -6496,8 +6493,6 @@ AC_CHECK_HEADERS([panel.h]) - - AS_VAR_IF([ac_cv_header_panel_h], [yes], [ - -- if test "$ac_sys_system" != "Darwin"; then -- dnl On macOS, there is no separate /usr/lib/libncursesw nor libpanelw. - AS_VAR_IF([have_curses], [ncursesw], [ - PKG_CHECK_MODULES([PANEL], [panelw], [ - have_panel=panelw -@@ -6511,7 +6506,6 @@ AS_VAR_IF([ac_cv_header_panel_h], [yes], [ - ]) - ]) - ]) -- fi - - AS_VAR_IF([have_curses], [ncurses], [ - PKG_CHECK_MODULES([PANEL], [panel], [