python-numpy: Update to 1.26.2
* the removed patches have been upstreamed * move to cython 3 * some cleanup
This commit is contained in:
@@ -1,11 +0,0 @@
|
||||
--- a/numpy/meson.build
|
||||
+++ b/numpy/meson.build
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
if is_mingw
|
||||
# For mingw-w64, link statically against the UCRT.
|
||||
- gcc_link_args = ['-lucrt', '-static']
|
||||
+ gcc_link_args = []
|
||||
add_project_link_arguments(gcc_link_args, language: ['c', 'cpp'])
|
||||
# Force gcc to float64 long doubles for compatibility with MSVC
|
||||
# builds, for C only.
|
||||
@@ -1,10 +0,0 @@
|
||||
--- a/numpy/meson.build
|
||||
+++ b/numpy/meson.build
|
||||
@@ -18,7 +18,6 @@
|
||||
add_project_link_arguments(gcc_link_args, language: ['c', 'cpp'])
|
||||
# Force gcc to float64 long doubles for compatibility with MSVC
|
||||
# builds, for C only.
|
||||
- add_project_arguments('-mlong-double-64', language: 'c')
|
||||
# Make fprintf("%zd") work (see https://github.com/rgommers/scipy/issues/118)
|
||||
add_project_arguments('-D__USE_MINGW_ANSI_STDIO=1', language: ['c', 'cpp'])
|
||||
endif
|
||||
@@ -1,20 +0,0 @@
|
||||
--- a/numpy/core/meson.build
|
||||
+++ b/numpy/core/meson.build
|
||||
@@ -275,17 +275,6 @@
|
||||
endif
|
||||
if have_strtold_l
|
||||
cdata.set10('HAVE_STRTOLD_L', true)
|
||||
-else
|
||||
- # FIXME: this is wrong! the HAVE_ define should not exist, or it'll be
|
||||
- # interpreted as the function being available (true/false does nothing, see
|
||||
- # note on HAVE_ defines higher up). This is necessary though in order to make
|
||||
- # the Linux CI job pass. So either the check is wrong somehow, or this
|
||||
- # function is not available in CI. For the latter there is a fallback path,
|
||||
- # but that is broken because we don't have the exact long double
|
||||
- # representation checks.
|
||||
- if cc.get_argument_syntax() != 'msvc'
|
||||
- cdata.set10('HAVE_STRTOLD_L', false)
|
||||
- endif
|
||||
endif
|
||||
|
||||
# Other optional functions
|
||||
@@ -8,7 +8,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.26.1
|
||||
pkgver=1.26.2
|
||||
pkgrel=1
|
||||
pkgdesc="Scientific tools for Python (mingw-w64)"
|
||||
arch=('any')
|
||||
@@ -21,7 +21,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python-build"
|
||||
"${MINGW_PACKAGE_PREFIX}-meson-python"
|
||||
"${MINGW_PACKAGE_PREFIX}-pkgconf"
|
||||
"${MINGW_PACKAGE_PREFIX}-ninja"
|
||||
"${MINGW_PACKAGE_PREFIX}-cython0"
|
||||
"${MINGW_PACKAGE_PREFIX}-cython"
|
||||
"${MINGW_PACKAGE_PREFIX}-cc")
|
||||
checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest")
|
||||
depends=("${MINGW_PACKAGE_PREFIX}-python"
|
||||
@@ -29,14 +29,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-python"
|
||||
optdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest: testsuite")
|
||||
options=(!strip)
|
||||
source=(https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz
|
||||
0001-no-static-linking.patch
|
||||
0002-no-long-double-64.patch
|
||||
0003-no-strtold_l.patch
|
||||
0007-disable-64bit-experimental-warning.patch)
|
||||
sha256sums=('c8c6c72d4a9f831f328efb1312642a1cafafaa88981d9ab76368d50d07d93cbe'
|
||||
'532eca91c3d46c102c4f81d9acaf921bedcdcd07a827820e868bfbb1f62dd258'
|
||||
'0c26d7174fb0338210bfb291ca25c01074f3079232c32a1b4e9ae3da70d2fd80'
|
||||
'181ffb50fccbd60b6d85aa20e94443634b99090c9ec85014f05fa532c4017446'
|
||||
sha256sums=('f65738447676ab5777f11e6bbbdb8ce11b785e105f690bc45966574816b6d3ea'
|
||||
'cafc924fd11d8653a49970d0cce5b31869cce0e8996a3ae57bcbccca96bc8eb3')
|
||||
|
||||
# Helper macros to help make tasks easier #
|
||||
@@ -52,13 +46,8 @@ prepare() {
|
||||
cd ${_realname}-${pkgver}
|
||||
|
||||
apply_patch_with_msg \
|
||||
0001-no-static-linking.patch \
|
||||
0002-no-long-double-64.patch \
|
||||
0003-no-strtold_l.patch \
|
||||
0007-disable-64bit-experimental-warning.patch
|
||||
|
||||
find . -type f -name "*.orig" -exec rm -f {} \;
|
||||
|
||||
cd "$srcdir"
|
||||
rm -rf python-build-${MSYSTEM} | true
|
||||
cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
|
||||
@@ -66,7 +55,7 @@ prepare() {
|
||||
|
||||
build() {
|
||||
cd python-build-${MSYSTEM}
|
||||
CFLAGS+=" -Wno-implicit-function-declaration" \
|
||||
|
||||
${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation \
|
||||
-Csetup-args="-Duse-ilp64=false" \
|
||||
-Csetup-args="-Dblas=openblas" \
|
||||
|
||||
Reference in New Issue
Block a user