Date: Fri, 03 Apr 2026 19:01:44 +0000 From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8b32e5370ce7 - main - math/py-numpy: update to 2.4.3 Message-ID: <69d00e98.3002c.d7dbd6b@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b32e5370ce76d6ea1394ea715665102b41e4e62 commit 8b32e5370ce76d6ea1394ea715665102b41e4e62 Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2026-03-26 19:28:38 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2026-04-03 18:52:24 +0000 math/py-numpy: update to 2.4.3 Changelogs: - https://numpy.org/doc/stable/release.html - minor versions in commit logs PR: 281470 Differential Revision: https://reviews.freebsd.org/D56094 --- math/py-numpy/Makefile | 107 +++++++-------------- math/py-numpy/distinfo | 10 +- math/py-numpy/files/patch-clang | 13 --- .../files/patch-numpy-distutils-exec_command.py | 11 --- .../patch-numpy-distutils-fcompiler-__init__.py | 11 --- .../files/patch-numpy-distutils-fcompiler-gnu.py | 35 ------- .../files/patch-numpy-distutils-system_info.py | 22 ----- math/py-numpy/files/patch-numpy_core_setup.py | 19 ---- ...atch-numpy_core_src_common_npy__cpu__features.c | 47 --------- .../patch-numpy_distutils_mingw32ccompiler.py | 17 ---- math/py-numpy/files/patch-numpy_f2py_f2py2e.py | 18 ---- math/py-numpy/files/patch-numpy_random_setup.py | 23 ----- math/py-numpy/files/patch-pyproject.toml | 13 --- math/py-numpy/files/patch-swig44 | 19 ---- math/py-numpy/files/site.cfg | 10 -- 15 files changed, 38 insertions(+), 337 deletions(-) diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index f74ba6521ab4..71450f878bc2 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -1,102 +1,61 @@ PORTNAME= numpy -PORTVERSION= 1.26.4 -PORTREVISION= 12 +DISTVERSION= 2.4.3 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= PYPI \ - https://numpy.org/doc/1.26/:doc + https://numpy.org/doc/${DISTVERSION:R}/:doc PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTFILES= numpy-${PORTVERSION}${EXTRACT_SUFX} \ - numpy-html.zip:doc -DIST_SUBDIR= numpy-${PORTVERSION:R} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + ${PORTNAME}-html.zip:doc +DIST_SUBDIR= ${PORTNAME}-${DISTVERSION:R} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= python@FreeBSD.org -COMMENT= The New Numeric Extension to Python +COMMENT= Fundamental package for array computing in Python WWW= https://www.numpy.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYTHON_PKGNAMEPREFIX}meson-python>=0:devel/meson-python@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>=6.24.1:devel/py-hypothesis@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest>=6.2.5:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.2.0:devel/py-typing-extensions@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meson-python>=0.18.0,1:devel/meson-python@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>=5.3.0:devel/py-hypothesis@${PY_FLAVOR} -USES= compiler:c11 cpe fortran pkgconfig python shebangfix -USE_PYTHON= autoplist concurrent cython pep517 +USES= compiler:c++17-lang cpe fortran pkgconfig python:3.11+ shebangfix +USE_PYTHON= allflavors autoplist concurrent cython pep517 pytest -GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so | ${SED} -e \ - s/libgfortran.so// -PYDISTUTILS_CONFIGUREARGS= --fcompiler=gnu95 -PYDISTUTILS_BUILDARGS= --fcompiler=gnu95 +PEP517_BUILD_CONFIG_SETTING= -Csetup-args=-Dallow-noblas=false +WITHOUT_FBSD10_FIX= yes +SHEBANG_GLOB= *.py BINARY_ALIAS= cython=cython-${PYTHON_VER} - -LDFLAGS+= -s -PIE_UNSAFE= yes - -PORTSCOUT= limit:^1\. - PORTDOCS= * -OPTIONS_DEFINE= DOCS SUITESPARSE -OPTIONS_DEFAULT= OPENBLAS SUITESPARSE -OPTIONS_SINGLE= BLASLIB -OPTIONS_SINGLE_BLASLIB= ATLAS NETLIB OPENBLAS -SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse - -ATLAS_USES= blaslapack:atlas -ATLAS_VARS= BLASLIBS="ptf77blas, ptcblas" \ - BLASNAME=atlas \ - LAPACKLIBS=alapack \ - LIBRARIES=atlas_libs -NETLIB_LIB_DEPENDS= libcblas.so:math/cblas -NETLIB_USES= blaslapack:netlib -NETLIB_VARS= BLASLIBS="blas, cblas" \ - BLASNAME=atlas \ - LAPACKLIBS=lapack \ - LIBRARIES=atlas_libs -OPENBLAS_USES= blaslapack:openblas -OPENBLAS_VARS= BLASLIBS="openblas, gfortran" \ - BLASNAME=openblas \ - LAPACKLIBS="openblas, gfortran" \ - LIBRARIES=libraries -SUITESPARSE_LIB_DEPENDS= libumfpack.so:math/suitesparse-umfpack - -SHEBANG_FILES= numpy/f2py/crackfortran.py numpy/f2py/f2py2e.py \ - numpy/f2py/rules.py numpy/testing/print_coercion_tables.py \ - numpy/testing/setup.py +CONFLICTS_INSTALL= py*-numpy1 -post-extract: - @${TOUCH} ${WRKSRC}/numpy/f2py/tests/src/temp - @${TOUCH} ${WRKSRC}/numpy/random/_examples/temp - @${TOUCH} ${WRKSRC}/numpy/core/tests/examples/temp +TEST_WRKSRC= ${WRKDIR} +TEST_ARGS= --pyargs numpy -pre-configure: - @${REINPLACE_CMD} -e 's|%%FC%%|${FC}|' ${WRKSRC}/numpy/distutils/fcompiler/gnu.py - @${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg - ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - -e 's|%%BLASLIBS%%|${BLASLIBS}|; s|%%BLASNAME%%|${BLASNAME}|' \ - -e 's|%%LAPACKLIBS%%|${LAPACKLIBS}|; s|%%LIBRARIES%%|${LIBRARIES}|' \ - ${WRKSRC}/site.cfg - @${REINPLACE_CMD} -e "s|%%GCCLIBDIR%%|$$(${GCCLIBDIR_CMDS})|" ${WRKSRC}/site.cfg ${WRKSRC}/numpy/distutils/system_info.py - -pre-configure-SUITESPARSE-off: - @${REINPLACE_CMD} -e 's|:%%LOCALBASE%%/include/suitesparse||' ${WRKSRC}/site.cfg - -do-configure: - -post-install: - ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' | ${XARGS} ${STRIP_CMD} +OPTIONS_DEFINE= DOCS +OPTIONS_SINGLE= BLASLIB +OPTIONS_SINGLE_BLASLIB= BLIS FLEXIBLAS NETLIB OPENBLAS +OPTIONS_DEFAULT= OPENBLAS +BLIS_DESC= BLIS BLAS-like implementation +FLEXIBLAS_DESC= FlexiBLAS BLAS implementation + +BLIS_USES= blaslapack:blis +BLIS_VARS= PEP517_BUILD_CONFIG_SETTING+="-Csetup-args=-Dblas=blis -Csetup-args=-Dlapack=flame" +BLIS_BROKEN= math/libflame does not provide a pkg-config file +FLEXIBLAS_USES= blaslapack:flexiblas +FLEXIBLAS_VARS= PEP517_BUILD_CONFIG_SETTING+="-Csetup-args=-Dblas=flexiblas -Csetup-args=-Dlapack=flexiblas" +NETLIB_LIB_DEPENDS= libcblas.so:math/cblas +NETLIB_USES= blaslapack:netlib +NETLIB_VARS= PEP517_BUILD_CONFIG_SETTING+="-Csetup-args=-Dblas=blas -Csetup-args=-Dlapack=lapack" +OPENBLAS_USES= blaslapack:openblas +OPENBLAS_VARS= PEP517_BUILD_CONFIG_SETTING+="-Csetup-args=-Dblas=openblas -Csetup-args=-Dlapack=openblas" post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${UNZIP_NATIVE_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/numpy-html.zip -d ${STAGEDIR}${DOCSDIR} @${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo -do-test: - @cd ${WRKSRC} && ${PYTHON_CMD} runtests.py - .include <bsd.port.mk> diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo index 7e109d8c5f43..7d8ac25e7fb2 100644 --- a/math/py-numpy/distinfo +++ b/math/py-numpy/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1718154974 -SHA256 (numpy-1.26/numpy-1.26.4.tar.gz) = 2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010 -SIZE (numpy-1.26/numpy-1.26.4.tar.gz) = 15786129 -SHA256 (numpy-1.26/numpy-html.zip) = 1dc88fc45a7709143b7b917e8e807e4985c41fe3fb7ee5fc55c3aeec5f369fdd -SIZE (numpy-1.26/numpy-html.zip) = 25538887 +TIMESTAMP = 1774059982 +SHA256 (numpy-2.4/numpy-2.4.3.tar.gz) = 483a201202b73495f00dbc83796c6ae63137a9bdade074f7648b3e32613412dd +SIZE (numpy-2.4/numpy-2.4.3.tar.gz) = 20727743 +SHA256 (numpy-2.4/numpy-html.zip) = 905f823345774ce868c33cb2ccfc0ef4ca3717df0ec45eb8c18429c8763eadb0 +SIZE (numpy-2.4/numpy-html.zip) = 34959264 diff --git a/math/py-numpy/files/patch-clang b/math/py-numpy/files/patch-clang deleted file mode 100644 index 5802f130651e..000000000000 --- a/math/py-numpy/files/patch-clang +++ /dev/null @@ -1,13 +0,0 @@ ---- numpy/distutils/checks/cpu_avx512_spr.c.orig 2024-02-05 21:17:48 UTC -+++ numpy/distutils/checks/cpu_avx512_spr.c -@@ -15,10 +15,6 @@ int main(int argc, char **argv) - - int main(int argc, char **argv) - { --/* clang has a bug regarding our spr coode, see gh-23730. */ --#if __clang__ --#error --#endif - __m512h a = _mm512_loadu_ph((void*)argv[argc-1]); - __m512h temp = _mm512_fmadd_ph(a, a, a); - _mm512_storeu_ph((void*)(argv[argc-1]), temp); diff --git a/math/py-numpy/files/patch-numpy-distutils-exec_command.py b/math/py-numpy/files/patch-numpy-distutils-exec_command.py deleted file mode 100644 index a99e5814811d..000000000000 --- a/math/py-numpy/files/patch-numpy-distutils-exec_command.py +++ /dev/null @@ -1,11 +0,0 @@ ---- numpy/distutils/exec_command.py.orig 2021-05-08 18:35:28 UTC -+++ numpy/distutils/exec_command.py -@@ -261,7 +261,7 @@ def _exec_command(command, use_shell=None, use_tee = N - - if os.name == 'posix' and use_shell: - # On POSIX, subprocess always uses /bin/sh, override -- sh = os.environ.get('SHELL', '/bin/sh') -+ sh = '/bin/sh' - if is_sequence(command): - command = [sh, '-c', ' '.join(command)] - else: diff --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py deleted file mode 100644 index 63c4d24b2f9b..000000000000 --- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py +++ /dev/null @@ -1,11 +0,0 @@ ---- numpy/distutils/fcompiler/__init__.py.orig 2021-05-09 10:38:00 UTC -+++ numpy/distutils/fcompiler/__init__.py -@@ -171,7 +171,7 @@ class FCompiler(CCompiler): - # gnu95 compiler type when there are F90 sources. - suggested_f90_compiler = None - -- compile_switch = "-c" -+ compile_switch = "-fPIC" - object_switch = "-o " # Ending space matters! It will be stripped - # but if it is missing then object_switch - # will be prefixed to object file name by diff --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py deleted file mode 100644 index 5efb5d0a3d37..000000000000 --- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py +++ /dev/null @@ -1,35 +0,0 @@ ---- numpy/distutils/fcompiler/gnu.py.orig 2021-05-08 21:14:06 UTC -+++ numpy/distutils/fcompiler/gnu.py -@@ -79,7 +79,7 @@ class GnuFCompiler(FCompiler): - return None - return v[1] - -- possible_executables = ['g77', 'f77'] -+ possible_executables = ['%%FC%%', 'g77', 'f77'] - executables = { - 'version_cmd' : [None, "-dumpversion"], - 'compiler_f77' : [None, "-g", "-Wall", "-fno-second-underscore"], -@@ -103,11 +103,13 @@ class GnuFCompiler(FCompiler): - for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']: - executables[key].append('-mno-cygwin') - -- g2c = 'g2c' -+ g2c = '%%FC%%' - suggested_f90_compiler = 'gnu95' - - def get_flags_linker_so(self): - opt = self.linker_so[1:] -+ if 'FFLAGS' in os.environ: -+ opt.append(os.environ['FFLAGS']) - if sys.platform == 'darwin': - target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', None) - # If MACOSX_DEPLOYMENT_TARGET is set, we simply trust the value -@@ -287,7 +289,7 @@ class Gnu95FCompiler(GnuFCompiler): - self.executables[key].append('-mno-cygwin') - return v - -- possible_executables = ['gfortran', 'f95'] -+ possible_executables = ['%%FC%%', 'gfortran', 'f95'] - executables = { - 'version_cmd' : ["<F90>", "-dumpversion"], - 'compiler_f77' : [None, "-Wall", "-g", "-ffixed-form", diff --git a/math/py-numpy/files/patch-numpy-distutils-system_info.py b/math/py-numpy/files/patch-numpy-distutils-system_info.py deleted file mode 100644 index 4ba9667e65c6..000000000000 --- a/math/py-numpy/files/patch-numpy-distutils-system_info.py +++ /dev/null @@ -1,22 +0,0 @@ ---- numpy/distutils/system_info.py.orig 2021-05-09 10:38:00 UTC -+++ numpy/distutils/system_info.py -@@ -209,6 +209,8 @@ def _c_string_literal(s): - Convert a python string into a literal suitable for inclusion into C code - """ - # only these three characters are forbidden in C strings -+ if s is None: -+ return '"None"' - s = s.replace('\\', r'\\') - s = s.replace('"', r'\"') - s = s.replace('\n', r'\n') -@@ -1322,8 +1324,8 @@ class atlas_info(system_info): - dir_env_var = 'ATLAS' - _lib_names = ['f77blas', 'cblas'] - if sys.platform[:7] == 'freebsd': -- _lib_atlas = ['atlas_r'] -- _lib_lapack = ['alapack_r'] -+ _lib_atlas = ['atlas'] -+ _lib_lapack = ['alapack'] - else: - _lib_atlas = ['atlas'] - _lib_lapack = ['lapack'] diff --git a/math/py-numpy/files/patch-numpy_core_setup.py b/math/py-numpy/files/patch-numpy_core_setup.py deleted file mode 100644 index 7502a4df93fb..000000000000 --- a/math/py-numpy/files/patch-numpy_core_setup.py +++ /dev/null @@ -1,19 +0,0 @@ ---- numpy/core/setup.py.orig 2024-02-05 21:17:48 UTC -+++ numpy/core/setup.py -@@ -9,7 +9,6 @@ from numpy.distutils import log - from os.path import join - - from numpy.distutils import log --from numpy.distutils.msvccompiler import lib_opts_if_msvc - from distutils.dep_util import newer - from sysconfig import get_config_var - from numpy.compat import npy_load_module -@@ -688,7 +687,7 @@ def configuration(parent_package='',top_path=None): - install_dir='lib', - build_info={ - 'include_dirs' : [], # empty list required for creating npy_math_internal.h -- 'extra_compiler_args': [lib_opts_if_msvc], -+ 'extra_compiler_args': [], - }) - config.add_npy_pkg_config("npymath.ini.in", "lib/npy-pkg-config", - subst_dict) diff --git a/math/py-numpy/files/patch-numpy_core_src_common_npy__cpu__features.c b/math/py-numpy/files/patch-numpy_core_src_common_npy__cpu__features.c deleted file mode 100644 index 0b9fc238b7ca..000000000000 --- a/math/py-numpy/files/patch-numpy_core_src_common_npy__cpu__features.c +++ /dev/null @@ -1,47 +0,0 @@ ---- numpy/core/src/common/npy_cpu_features.c.orig 2023-06-18 00:19:04 UTC -+++ numpy/core/src/common/npy_cpu_features.c -@@ -570,6 +570,18 @@ npy__cpu_init_features(void) - #ifndef PPC_FEATURE2_ARCH_3_1 - #define PPC_FEATURE2_ARCH_3_1 0x00040000 - #endif -+#elif defined(__FreeBSD__) -+ #include <machine/cpu.h> -+ #include <sys/auxv.h> -+ #ifndef PPC_FEATURE2_ARCH_2_07 -+ #define PPC_FEATURE2_ARCH_2_07 0x80000000 -+ #endif -+ #ifndef PPC_FEATURE2_ARCH_3_00 -+ #define PPC_FEATURE2_ARCH_3_00 0x00800000 -+ #endif -+ #ifndef PPC_FEATURE2_ARCH_3_1 -+ #define PPC_FEATURE2_ARCH_3_1 0x00040000 -+ #endif - #endif - - static void -@@ -591,6 +603,25 @@ npy__cpu_init_features(void) - - elf_aux_info(AT_HWCAP2, &hwcap, sizeof(hwcap)); - #endif // __linux__ -+ if (hwcap & PPC_FEATURE2_ARCH_3_1) -+ { -+ npy__cpu_have[NPY_CPU_FEATURE_VSX] = -+ npy__cpu_have[NPY_CPU_FEATURE_VSX2] = -+ npy__cpu_have[NPY_CPU_FEATURE_VSX3] = -+ npy__cpu_have[NPY_CPU_FEATURE_VSX4] = 1; -+ return; -+ } -+ npy__cpu_have[NPY_CPU_FEATURE_VSX] = 1; -+ npy__cpu_have[NPY_CPU_FEATURE_VSX2] = (hwcap & PPC_FEATURE2_ARCH_2_07) != 0; -+ npy__cpu_have[NPY_CPU_FEATURE_VSX3] = (hwcap & PPC_FEATURE2_ARCH_3_00) != 0; -+ npy__cpu_have[NPY_CPU_FEATURE_VSX4] = (hwcap & PPC_FEATURE2_ARCH_3_1) != 0; -+#elif defined(__FreeBSD__) -+ unsigned long hwcap; -+ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)); -+ if ((hwcap & PPC_FEATURE_HAS_VSX) == 0) -+ return; -+ -+ elf_aux_info(AT_HWCAP2, &hwcap, sizeof(hwcap)); - if (hwcap & PPC_FEATURE2_ARCH_3_1) - { - npy__cpu_have[NPY_CPU_FEATURE_VSX] = diff --git a/math/py-numpy/files/patch-numpy_distutils_mingw32ccompiler.py b/math/py-numpy/files/patch-numpy_distutils_mingw32ccompiler.py deleted file mode 100644 index a7466a818792..000000000000 --- a/math/py-numpy/files/patch-numpy_distutils_mingw32ccompiler.py +++ /dev/null @@ -1,17 +0,0 @@ ---- numpy/distutils/mingw32ccompiler.py.orig 2024-02-05 21:17:48 UTC -+++ numpy/distutils/mingw32ccompiler.py -@@ -24,7 +24,13 @@ from distutils.unixccompiler import UnixCCompiler - - import distutils.cygwinccompiler - from distutils.unixccompiler import UnixCCompiler --from distutils.msvccompiler import get_build_version as get_build_msvc_version -+ -+try: -+ from distutils.msvccompiler import get_build_version as get_build_msvc_version -+except ImportError: -+ def get_build_msvc_version(): -+ return None -+ - from distutils.errors import UnknownFileError - from numpy.distutils.misc_util import (msvc_runtime_library, - msvc_runtime_version, diff --git a/math/py-numpy/files/patch-numpy_f2py_f2py2e.py b/math/py-numpy/files/patch-numpy_f2py_f2py2e.py deleted file mode 100644 index 6cdc7b44718a..000000000000 --- a/math/py-numpy/files/patch-numpy_f2py_f2py2e.py +++ /dev/null @@ -1,18 +0,0 @@ ---- numpy/f2py/f2py2e.py.orig 2024-06-12 01:22:27 UTC -+++ numpy/f2py/f2py2e.py -@@ -693,6 +693,7 @@ def run_compile(): - extra_objects, sources = filter_files('', '[.](o|a|so|dylib)', sources) - library_dirs, sources = filter_files('-L', '', sources, remove_prefix=1) - libraries, sources = filter_files('-l', '', sources, remove_prefix=1) -+ extra_link_args, sources = filter_files('-Wl,|-B|-f','',sources,remove_prefix=0) - undef_macros, sources = filter_files('-U', '', sources, remove_prefix=1) - define_macros, sources = filter_files('-D', '', sources, remove_prefix=1) - for i in range(len(define_macros)): -@@ -727,6 +728,7 @@ def run_compile(): - define_macros, - undef_macros, - f2py_flags, -+ extra_link_args, - sysinfo_flags, - fc_flags, - flib_flags, diff --git a/math/py-numpy/files/patch-numpy_random_setup.py b/math/py-numpy/files/patch-numpy_random_setup.py deleted file mode 100644 index 74ff5ffc8e54..000000000000 --- a/math/py-numpy/files/patch-numpy_random_setup.py +++ /dev/null @@ -1,23 +0,0 @@ ---- numpy/random/setup.py.orig 2024-02-05 21:17:48 UTC -+++ numpy/random/setup.py -@@ -3,7 +3,6 @@ from numpy.distutils.system_info import platform_bits - from os.path import join - - from numpy.distutils.system_info import platform_bits --from numpy.distutils.msvccompiler import lib_opts_if_msvc - - - def configuration(parent_package='', top_path=None): -@@ -70,11 +69,7 @@ def configuration(parent_package='', top_path=None): - not initialized the distutils build command, so use this deferred - calculation to run when we are building the library. - """ -- opts = lib_opts_if_msvc(build_cmd) -- if build_cmd.compiler.compiler_type != 'msvc': -- # Some bit generators require c99 -- opts.append('-std=c99') -- return opts -+ return ['-std=c99'] - - config.add_installed_library('npyrandom', - sources=npyrandom_sources, diff --git a/math/py-numpy/files/patch-pyproject.toml b/math/py-numpy/files/patch-pyproject.toml deleted file mode 100644 index e2eda9b1cea3..000000000000 --- a/math/py-numpy/files/patch-pyproject.toml +++ /dev/null @@ -1,13 +0,0 @@ ---- pyproject.toml.orig 2024-02-05 21:17:48 UTC -+++ pyproject.toml -@@ -1,8 +1,8 @@ requires = [ - [build-system] - build-backend = "mesonpy" - requires = [ -- "Cython>=0.29.34,<3.1", -- "meson-python>=0.15.0,<0.16.0", -+ "Cython>=0.29.34", -+ "meson-python>=0.15.0", - ] - - [project] diff --git a/math/py-numpy/files/patch-swig44 b/math/py-numpy/files/patch-swig44 deleted file mode 100644 index 4b0cd4694c85..000000000000 --- a/math/py-numpy/files/patch-swig44 +++ /dev/null @@ -1,19 +0,0 @@ -Reference: https://github.com/numpy/numpy/commit/1e424dae42a2d560520b6e053e8e60ac4205bfc7 - ---- numpy/core/code_generators/generate_numpy_api.py.orig 2024-02-05 21:17:48 UTC -+++ numpy/core/code_generators/generate_numpy_api.py -@@ -118,7 +118,13 @@ _import_array(void) - return 0; - } - --#define import_array() {if (_import_array() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import"); return NULL; } } -+#if (SWIG_VERSION < 0x040400) -+#define _RETURN_VALUE NULL -+#else -+#define _RETURN_VALUE 0 -+#endif -+ -+#define import_array() {if (_import_array() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import"); return _RETURN_VALUE; } } - - #define import_array1(ret) {if (_import_array() < 0) {PyErr_Print(); PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import"); return ret; } } - diff --git a/math/py-numpy/files/site.cfg b/math/py-numpy/files/site.cfg deleted file mode 100644 index 04c5da865afe..000000000000 --- a/math/py-numpy/files/site.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[DEFAULT] -library_dirs = /usr/lib:%%LOCALBASE%%/lib:%%GCCLIBDIR%% -include_dirs = /usr/include:%%LOCALBASE%%/include:%%LOCALBASE%%/include/suitesparse -src_dirs = %%LOCALBASE%%/src -# search static libraries (.a) in preference to shared ones (.so) -search_static_first = 0 - -[%%BLASNAME%%] -%%LIBRARIES%% = %%BLASLIBS%% -lapack_libs = %%LAPACKLIBS%%home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d00e98.3002c.d7dbd6b>