diff --git a/mingw-w64-python/0148-Use-shared-instead-of-mdll.patch b/mingw-w64-python/0148-Use-shared-instead-of-mdll.patch deleted file mode 100644 index 7a4ab7aca0..0000000000 --- a/mingw-w64-python/0148-Use-shared-instead-of-mdll.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f761ea235f7577c8143c7d4db2e0f991346fc751 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= - =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= -Date: Wed, 27 Sep 2023 21:45:13 +0100 -Subject: [PATCH 148/148] Use `-shared` instead of `-mdll` - ---- - Lib/distutils/cygwinccompiler.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py -index d8c8428ac0..860b48c498 100644 ---- a/Lib/distutils/cygwinccompiler.py -+++ b/Lib/distutils/cygwinccompiler.py -@@ -125,7 +125,7 @@ def __init__(self, verbose=0, dry_run=0, force=0): - shared_option = "-shared" - - self.set_executables(compiler='%s -mcygwin -O -Wall' % self.cc, -- compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc, -+ compiler_so='%s -mcygwin -shared -O -Wall' % self.cc, - compiler_cxx='%s -mcygwin -O -Wall' % self.cxx, - linker_exe='%s -mcygwin' % self.cc, - linker_so=('%s -mcygwin %s' % -@@ -287,7 +287,7 @@ def __init__(self, verbose=0, dry_run=0, force=0): - 'Cygwin gcc cannot be used with --compiler=mingw32') - - self.set_executables(compiler='%s -O2 -Wall' % self.cc, -- compiler_so='%s -mdll -O2 -Wall' % self.cc, -+ compiler_so='%s -shared -O2 -Wall' % self.cc, - compiler_cxx='%s -O2 -Wall' % self.cxx, - linker_exe='%s' % self.cc, - linker_so='%s %s' --- -2.42.0.windows.1 - diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD index 08784720bd..5e103f75ae 100644 --- a/mingw-w64-python/PKGBUILD +++ b/mingw-w64-python/PKGBUILD @@ -22,11 +22,11 @@ else pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}${_pybasever}") fi pkgver=${_pybasever}.5 -pkgrel=3 +pkgrel=2 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') -license=('spdx:PSF-2.0') +license=('PSF') url="https://www.python.org/" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-expat" @@ -46,7 +46,7 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-autotools" "autoconf-archive" ) -#options=('debug' '!strip') +options=('makeflags') # 'debug' '!strip') source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz" 0001-sysconfig-make-_sysconfigdata.py-relocatable.patch 0002-build-add-with-nt-threads-and-make-it-default-on-min.patch @@ -194,8 +194,7 @@ source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz 0144-setup.py-don-t-prepend-the-system-library-directorie.patch 0145-tests-skip-a-broken-test.patch 0146-Port-GetPythonImport-to-mingw.patch - 0147-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch - 0148-Use-shared-instead-of-mdll.patch) + 0147-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch) # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -355,8 +354,7 @@ prepare() { 0144-setup.py-don-t-prepend-the-system-library-directorie.patch \ 0145-tests-skip-a-broken-test.patch \ 0146-Port-GetPythonImport-to-mingw.patch \ - 0147-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch \ - 0148-Use-shared-instead-of-mdll.patch + 0147-LoadLibraryExW-make-sure-to-only-use-backslashes-for.patch autoreconf -vfi } @@ -604,5 +602,4 @@ sha256sums=('85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f' '6e0d29ee44c5d5ab8605a980c7cee246acf5ccce638e6a7cee4c4e7a8ec865cd' '3b6bf12600203d45ff9b0ecde0bb9959c4fde923c9609e4c1e18b6d7877e3f1b' 'd9a54181024f0b538d8903bdf772a0dd754811aab339e6f553c47e1198ab04cc' - '71fd408d8bb8ca40584f287adea583032d1b7150f011abe2165c44d468428f0f' - '552c9d8d38c399424d3215fd4e69ab4a78752daad3a6b3ce4af313ae6f677462') + '71fd408d8bb8ca40584f287adea583032d1b7150f011abe2165c44d468428f0f')