Attachment #264489 for bug #287794

Lines 1-6 Link Here

(-)b/math/py-numpy/Makefile (-3 / +9 lines)
1	PORTNAME= numpy	1	PORTNAME= numpy
2	PORTVERSION= 1.26.4	2	PORTVERSION= 1.26.4
3	PORTREVISION= 7	3	PORTREVISION= 8
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= math python	5	CATEGORIES= math python
6	MASTER_SITES= PYPI \	6	MASTER_SITES= PYPI \
Lines 18-29 WWW= https://www.numpy.org/ Link Here
18	LICENSE= BSD3CLAUSE	18	LICENSE= BSD3CLAUSE
19	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	19	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
20		20
		21	BUILD_DEPENDS= ${PY_SETUPTOOLS} \
		22	${PYTHON_PKGNAMEPREFIX}meson-python>=0:devel/meson-python@${PY_FLAVOR}
21	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>=6.24.1:devel/py-hypothesis@${PY_FLAVOR} \	23	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>=6.24.1:devel/py-hypothesis@${PY_FLAVOR} \
22	${PYTHON_PKGNAMEPREFIX}pytest>=6.2.5:devel/py-pytest@${PY_FLAVOR} \	24	${PYTHON_PKGNAMEPREFIX}pytest>=6.2.5:devel/py-pytest@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.2.0:devel/py-typing-extensions@${PY_FLAVOR}	25	${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.2.0:devel/py-typing-extensions@${PY_FLAVOR}
24		26
25	USES= compiler:c11 cpe fortran python:3.9+	27	USES= compiler:c11 cpe fortran pkgconfig python:3.9+ shebangfix
26	USE_PYTHON= allflavors autoplist concurrent cython distutils	28	USE_PYTHON= allflavors autoplist concurrent cython pep517
27		29
28	GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so \| ${SED} -e \	30	GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so \| ${SED} -e \
29	s/libgfortran.so//	31	s/libgfortran.so//
Lines 61-66 OPENBLAS_VARS= BLASLIBS="openblas, gfortran" \ Link Here
61	LIBRARIES=libraries	63	LIBRARIES=libraries
62	SUITESPARSE_LIB_DEPENDS= libumfpack.so:math/suitesparse-umfpack	64	SUITESPARSE_LIB_DEPENDS= libumfpack.so:math/suitesparse-umfpack
63		65
		66	SHEBANG_FILES= numpy/f2py/crackfortran.py numpy/f2py/f2py2e.py \
		67	numpy/f2py/rules.py numpy/testing/print_coercion_tables.py \
		68	numpy/testing/setup.py
		69
64	post-extract:	70	post-extract:
65	@${TOUCH} ${WRKSRC}/numpy/f2py/tests/src/temp	71	@${TOUCH} ${WRKSRC}/numpy/f2py/tests/src/temp
66	@${TOUCH} ${WRKSRC}/numpy/random/_examples/temp	72	@${TOUCH} ${WRKSRC}/numpy/random/_examples/temp




--- 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)




--- 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,




--- 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,

Added Link Here

(-)b/math/py-numpy/files/patch-pyproject.toml (-1 / +11 lines)
0	-	1	--- pyproject.toml.orig 2025-06-24 22:40:55 UTC
		2	+++ pyproject.toml
		3	@@ -2,7 +2,7 @@ requires = [
		4	build-backend = "mesonpy"
		5	requires = [
		6	"Cython>=0.29.34,<3.1",
		7	- "meson-python>=0.15.0,<0.16.0",
		8	+ "meson-python>=0.15.0",
		9	]
		10
		11	[project]

Return to bug 287794

Added Link Here

(-)b/math/py-numpy/files/patch-numpy_core_setup.py (+19 lines)
1	--- numpy/core/setup.py.orig 2024-02-05 21:17:48 UTC
2	+++ numpy/core/setup.py
3	@@ -9,7 +9,6 @@ from numpy.distutils import log
4	from os.path import join
5
6	from numpy.distutils import log
7	-from numpy.distutils.msvccompiler import lib_opts_if_msvc
8	from distutils.dep_util import newer
9	from sysconfig import get_config_var
10	from numpy.compat import npy_load_module
11	@@ -688,7 +687,7 @@ def configuration(parent_package='',top_path=None):
12	install_dir='lib',
13	build_info={
14	'include_dirs' : [], # empty list required for creating npy_math_internal.h
15	- 'extra_compiler_args': [lib_opts_if_msvc],
16	+ 'extra_compiler_args': [],
17	})
18	config.add_npy_pkg_config("npymath.ini.in", "lib/npy-pkg-config",
19	subst_dict)

Added Link Here

(-)b/math/py-numpy/files/patch-numpy_distutils_mingw32ccompiler.py (+17 lines)
1	--- numpy/distutils/mingw32ccompiler.py.orig 2024-02-05 21:17:48 UTC
2	+++ numpy/distutils/mingw32ccompiler.py
3	@@ -24,7 +24,13 @@ from distutils.unixccompiler import UnixCCompiler
4
5	import distutils.cygwinccompiler
6	from distutils.unixccompiler import UnixCCompiler
7	-from distutils.msvccompiler import get_build_version as get_build_msvc_version
8	+
9	+try:
10	+ from distutils.msvccompiler import get_build_version as get_build_msvc_version
11	+except ImportError:
12	+ def get_build_msvc_version():
13	+ return None
14	+
15	from distutils.errors import UnknownFileError
16	from numpy.distutils.misc_util import (msvc_runtime_library,
17	msvc_runtime_version,

Added Link Here

(-)b/math/py-numpy/files/patch-numpy_random_setup.py (+23 lines)
1	--- numpy/random/setup.py.orig 2024-02-05 21:17:48 UTC
2	+++ numpy/random/setup.py
3	@@ -3,7 +3,6 @@ from numpy.distutils.system_info import platform_bits
4	from os.path import join
5
6	from numpy.distutils.system_info import platform_bits
7	-from numpy.distutils.msvccompiler import lib_opts_if_msvc
8
9
10	def configuration(parent_package='', top_path=None):
11	@@ -70,11 +69,7 @@ def configuration(parent_package='', top_path=None):
12	not initialized the distutils build command, so use this deferred
13	calculation to run when we are building the library.
14	"""
15	- opts = lib_opts_if_msvc(build_cmd)
16	- if build_cmd.compiler.compiler_type != 'msvc':
17	- # Some bit generators require c99
18	- opts.append('-std=c99')
19	- return opts
20	+ return ['-std=c99']
21
22	config.add_installed_library('npyrandom',
23	sources=npyrandom_sources,