CVS commit: pkgsrc/math/py-numpy

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon May 14 06:36:17 UTC 2018

Modified Files:
        pkgsrc/math/py-numpy: distinfo
        pkgsrc/math/py-numpy/patches: patch-numpy_distutils_fcompiler_gnu.py

Log Message:
py-numpy: Do not generate debug symbols


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/math/py-numpy/distinfo
cvs rdiff -u -r1.13 -r1.14 \
    pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-numpy/distinfo
diff -u pkgsrc/math/py-numpy/distinfo:1.30 pkgsrc/math/py-numpy/distinfo:1.31
--- pkgsrc/math/py-numpy/distinfo:1.30  Wed May  2 04:42:25 2018
+++ pkgsrc/math/py-numpy/distinfo       Mon May 14 06:36:17 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2018/05/02 04:42:25 adam Exp $
+$NetBSD: distinfo,v 1.31 2018/05/14 06:36:17 adam Exp $
 
 SHA1 (numpy-1.14.3.zip) = 7c38949d06cf4e090eb96cbafa6269546561a80c
 RMD160 (numpy-1.14.3.zip) = cf0ab10d8a4da4bb9c21f38889043d8652ca1d49
@@ -7,5 +7,5 @@ Size (numpy-1.14.3.zip) = 4899927 bytes
 SHA1 (patch-aa) = c964fa13fb120b1b0f9d0bf5bc713507cd60b945
 SHA1 (patch-ab) = b421455fdbb666c8075d8bffbeb59533434d23e6
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed
-SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 4b0833d09560ebb954dd53ebc5cdcce339705bac
+SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = db8d3238c618ecd5900650a2150efb9459e94e96
 SHA1 (patch-numpy_distutils_system__info.py) = dfd88a140b65a66c222a95ea4be6f20a33702e3b

Index: pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
diff -u pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py:1.13 pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py:1.14
--- pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py:1.13    Thu Oct  5 08:21:27 2017
+++ pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py Mon May 14 06:36:17 2018
@@ -1,14 +1,15 @@
-$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.13 2017/10/05 08:21:27 adam Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.14 2018/05/14 06:36:17 adam Exp $
 
 Linker needs -shared explictly (at least with GCC 4.7 on SunOS), plus
 any ABI flags as appropriate.
+Do not generate debug symbols (remove '-g').
 On OS X, do not use '-bundle' and 'dynamic_lookup' (to avoid Python.framework).
 Do not use -funroll-loops compiler flag.
 Do not run a shell command when it is "None".
 
---- numpy/distutils/fcompiler/gnu.py.orig      2017-09-29 20:10:10.000000000 +0000
+--- numpy/distutils/fcompiler/gnu.py.orig      2018-04-23 16:28:56.000000000 +0000
 +++ numpy/distutils/fcompiler/gnu.py
-@@ -57,8 +57,10 @@ class GnuFCompiler(FCompiler):
+@@ -63,8 +63,10 @@ class GnuFCompiler(FCompiler):
                      return ('gfortran', m.group(1))
          else:
              # Output probably from --version, try harder:
@@ -20,16 +21,24 @@ Do not run a shell command when it is "N
                  return ('gfortran', m.group(1))
              m = re.search(
                  r'GNU Fortran.*?\-?([0-9-.]+\.[0-9-.]+)', version_string)
-@@ -88,7 +90,7 @@ class GnuFCompiler(FCompiler):
-         'compiler_f77' : [None, "-g", "-Wall", "-fno-second-underscore"],
+@@ -91,13 +93,13 @@ class GnuFCompiler(FCompiler):
+     possible_executables = ['g77', 'f77']
+     executables = {
+         'version_cmd'  : [None, "-dumpversion"],
+-        'compiler_f77' : [None, "-g", "-Wall", "-fno-second-underscore"],
++        'compiler_f77' : [None, "-Wall", "-fno-second-underscore"],
          'compiler_f90' : None,  # Use --fcompiler=gnu95 for f90 codes
          'compiler_fix' : None,
 -        'linker_so'    : [None, "-g", "-Wall"],
-+        'linker_so'    : [None, "-g", "-Wall", "-shared", ""],
++        'linker_so'    : [None, "-Wall", "-shared", ""],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
-         'linker_exe'   : [None, "-g", "-Wall"]
-@@ -140,7 +142,7 @@ class GnuFCompiler(FCompiler):
+-        'linker_exe'   : [None, "-g", "-Wall"]
++        'linker_exe'   : [None, "-Wall"]
+     }
+     module_dir_switch = None
+     module_include_switch = None
+@@ -146,7 +148,7 @@ class GnuFCompiler(FCompiler):
                      s = 'Env. variable MACOSX_DEPLOYMENT_TARGET set to 10.3'
                      warnings.warn(s, stacklevel=2)
  
@@ -38,7 +47,7 @@ Do not run a shell command when it is "N
          else:
              opt.append("-shared")
          if sys.platform.startswith('sunos'):
-@@ -216,7 +218,6 @@ class GnuFCompiler(FCompiler):
+@@ -237,7 +239,6 @@ class GnuFCompiler(FCompiler):
              opt = ['-O2']
          else:
              opt = ['-O3']
@@ -46,16 +55,25 @@ Do not run a shell command when it is "N
          return opt
  
      def _c_arch_flags(self):
-@@ -271,7 +272,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -288,13 +289,13 @@ class Gnu95FCompiler(GnuFCompiler):
+     possible_executables = ['gfortran', 'f95']
+     executables = {
+         'version_cmd'  : ["<F90>", "-dumpversion"],
+-        'compiler_f77' : [None, "-Wall", "-g", "-ffixed-form",
++        'compiler_f77' : [None, "-Wall", "-ffixed-form",
                            "-fno-second-underscore"] + _EXTRAFLAGS,
-         'compiler_fix' : [None, "-Wall",  "-g","-ffixed-form",
+-        'compiler_f90' : [None, "-Wall", "-g",
++        'compiler_f90' : [None, "-Wall",
+                           "-fno-second-underscore"] + _EXTRAFLAGS,
+-        'compiler_fix' : [None, "-Wall",  "-g","-ffixed-form",
++        'compiler_fix' : [None, "-Wall",  "-ffixed-form",
                            "-fno-second-underscore"] + _EXTRAFLAGS,
 -        'linker_so'    : ["<F90>", "-Wall", "-g"],
-+        'linker_so'    : ["<F90>", "-Wall", "-g", "-shared", ""],
++        'linker_so'    : ["<F90>", "-Wall", "-shared", ""],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-Wall"]
-@@ -284,7 +285,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -307,7 +308,7 @@ class Gnu95FCompiler(GnuFCompiler):
  
      def _universal_flags(self, cmd):
          """Return a list of -arch flags for every supported architecture."""