diff --git a/mingw-w64-python-scikit-learn/003-Fix-optimization-flag.patch b/mingw-w64-python-scikit-learn/003-Fix-optimization-flag.patch index 4dbfe6332e..66aa31601d 100644 --- a/mingw-w64-python-scikit-learn/003-Fix-optimization-flag.patch +++ b/mingw-w64-python-scikit-learn/003-Fix-optimization-flag.patch @@ -1,11 +1,11 @@ --- a/setup.py +++ b/setup.py -@@ -499,7 +499,7 @@ - np_include = numpy.get_include() - - optimization_level = "O2" -- if os.name == "posix": -+ if not "MSC" in sys.version: - default_extra_compile_args = [f"-{optimization_level}"] - default_libraries = ["m"] - else: +@@ -575,7 +575,7 @@ + optimization_level = extension.get( + "optimization_level", default_optimization_level + ) +- if os.name == "posix": ++ if not "MSC" in sys.version: + extra_compile_args.append(f"-{optimization_level}") + else: + extra_compile_args.append(f"/{optimization_level}") diff --git a/mingw-w64-python-scikit-learn/PKGBUILD b/mingw-w64-python-scikit-learn/PKGBUILD index 87460c6578..5dd1d29d47 100644 --- a/mingw-w64-python-scikit-learn/PKGBUILD +++ b/mingw-w64-python-scikit-learn/PKGBUILD @@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="A set of python modules for machine learning and data mining (mingw-w64)" arch=('any') @@ -28,16 +28,25 @@ source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realna 001-mingw-python-openmp-flag.patch 002-openmp-cleanup-wait.patch 003-Fix-optimization-flag.patch) -sha256sums=('680b65b3caee469541385d2ca5b03ff70408f6c618c583948312f0d2125df680' +sha256sums=('fbf8a5c893c9b4b99bcc7ed8fb3e8500957a113f4101860386d06635520f7cfb' '7817f0ac38fd47fb5731abf6ba76f0e8d6534f98e085048d0bc9cb5e402c8d43' 'b9e8d52dd9f989c8b75c086653690598f28378451fbd7078e8163bff1d76452e' - '28b5bb841050cce6e77e6ce9078097ed39e6ff0e2ff3f20b12368701bf92ff3c') + '653f294ec5185ff2df98144e67327ed85ba5412e29e8e5b936074894025ba540') + +apply_patch_with_msg() { + for _patch in "$@" + do + msg2 "Applying $_patch" + patch -Nbp1 -i "${srcdir}/$_patch" + done +} prepare() { cd ${_realname}-${pkgver} - patch -p1 -i ${srcdir}/001-mingw-python-openmp-flag.patch - patch -p1 -i ${srcdir}/002-openmp-cleanup-wait.patch - patch -p1 -i ${srcdir}/003-Fix-optimization-flag.patch + apply_patch_with_msg \ + 001-mingw-python-openmp-flag.patch \ + 002-openmp-cleanup-wait.patch \ + 003-Fix-optimization-flag.patch cd ${srcdir} rm -rf python-build-${MSYSTEM} | true