diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-02-21 16:11:06 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-02-21 16:11:06 +0000 |
| commit | f9d7c5e40df67b32de23f894524a6bd311c50007 (patch) | |
| tree | 07f537895f7f2c2f82355de5bacde3936881a8f7 /math/py-numpy/files | |
| parent | Update to 3.44 (diff) | |
Update to 1.16.1
- Move TEST_DEPENDS upward
- Simplify Makefile
Changes: https://github.com/numpy/numpy/releases
PR: 235721
Exp-run by: antoine
Notes
Notes:
svn path=/head/; revision=493516
Diffstat (limited to 'math/py-numpy/files')
4 files changed, 22 insertions, 24 deletions
diff --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py index a815cd68d724..4c52b846e1b4 100644 --- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py +++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py @@ -1,11 +1,11 @@ ---- numpy/distutils/fcompiler/__init__.py.orig 2008-04-06 23:03:15.000000000 +0900 -+++ numpy/distutils/fcompiler/__init__.py 2008-04-06 23:08:56.000000000 +0900 -@@ -179,7 +179,7 @@ +--- numpy/distutils/fcompiler/__init__.py.orig 2019-01-31 02:31:08 UTC ++++ numpy/distutils/fcompiler/__init__.py +@@ -177,7 +177,7 @@ class FCompiler(CCompiler): # gnu95 compiler type when there are F90 sources. suggested_f90_compiler = None - compile_switch = "-c" -+ compile_switch = "-c -fPIC" ++ 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-system_info.py b/math/py-numpy/files/patch-numpy-distutils-system_info.py index 20864eb025d2..14d70b2bf714 100644 --- a/math/py-numpy/files/patch-numpy-distutils-system_info.py +++ b/math/py-numpy/files/patch-numpy-distutils-system_info.py @@ -1,6 +1,15 @@ ---- numpy/distutils/system_info.py.orig 2016-10-03 23:42:24 UTC +--- numpy/distutils/system_info.py.orig 2019-01-31 02:31:08 UTC +++ numpy/distutils/system_info.py -@@ -1038,8 +1038,8 @@ class atlas_info(system_info): +@@ -169,6 +169,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') +@@ -1109,8 +1111,8 @@ class atlas_info(system_info): dir_env_var = 'ATLAS' _lib_names = ['f77blas', 'cblas'] if sys.platform[:7] == 'freebsd': @@ -11,8 +20,8 @@ else: _lib_atlas = ['atlas'] _lib_lapack = ['lapack'] -@@ -1574,11 +1574,6 @@ class blas_opt_info(system_info): - self.set_info(**blas_mkl_info) +@@ -1630,11 +1632,6 @@ class blas_opt_info(system_info): + self.set_info(**blis_info) return - openblas_info = get_info('openblas') diff --git a/math/py-numpy/files/patch-numpy-f2py-f2py2e.py b/math/py-numpy/files/patch-numpy-f2py-f2py2e.py index 44715a1138a8..762edb7c74c7 100644 --- a/math/py-numpy/files/patch-numpy-f2py-f2py2e.py +++ b/math/py-numpy/files/patch-numpy-f2py-f2py2e.py @@ -1,14 +1,14 @@ ---- numpy/f2py/f2py2e.py.orig 2014-10-26 10:36:14.000000000 -0400 -+++ numpy/f2py/f2py2e.py 2014-12-11 07:52:11.000000000 -0500 -@@ -516,6 +516,7 @@ +--- numpy/f2py/f2py2e.py.orig 2019-01-31 02:31:08 UTC ++++ numpy/f2py/f2py2e.py +@@ -599,6 +599,7 @@ def run_compile(): include_dirs, sources = filter_files('-I', '', sources, remove_prefix=1) 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) - using_numarray = 0 -@@ -551,6 +552,7 @@ + for i in range(len(define_macros)): +@@ -625,6 +626,7 @@ def run_compile(): 'undef_macros': undef_macros, 'extra_objects': extra_objects, 'f2py_options': f2py_flags, diff --git a/math/py-numpy/files/patch-numpy_f2py_setup.py b/math/py-numpy/files/patch-numpy_f2py_setup.py deleted file mode 100644 index cdc010a94095..000000000000 --- a/math/py-numpy/files/patch-numpy_f2py_setup.py +++ /dev/null @@ -1,11 +0,0 @@ ---- numpy/f2py/setup.py.orig 2015-08-11 17:03:43 UTC -+++ numpy/f2py/setup.py -@@ -55,7 +55,7 @@ def configuration(parent_package='', top - config.make_svn_version_py() - - def generate_f2py_py(build_dir): -- f2py_exe = 'f2py' + os.path.basename(sys.executable)[6:] -+ f2py_exe = 'f2py' - if f2py_exe[-4:] == '.exe': - f2py_exe = f2py_exe[:-4] + '.py' - if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py': |