svn commit: r374528 - in head/math/py-numpy: . files

[Diane Bruce]

Author: db
Date: Thu Dec 11 13:00:44 2014
New Revision: 374528
URL: https://svnweb.freebsd.org/changeset/ports/374528
QAT: https://qat.redports.org/buildarchive/r374528/

Log:
  - Tiny fix to f2py2e.py to allow it to deal with -fstack-protector flag
    as without this fix, f2py will attempt to compile -fstack-protector
  
  Submitted by:	db
  Reviewed by:	wg
  Approved by:	wg

Modified:
  head/math/py-numpy/Makefile
  head/math/py-numpy/files/patch-numpy-f2py-f2py2e.py

Modified: head/math/py-numpy/Makefile
==============================================================================
--- head/math/py-numpy/Makefile	Thu Dec 11 12:52:06 2014	(r374527)
+++ head/math/py-numpy/Makefile	Thu Dec 11 13:00:44 2014	(r374528)
@@ -3,6 +3,7 @@
 
 PORTNAME=	numpy
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://docs.scipy.org/doc/${PORTNAME}/:doc \

Modified: head/math/py-numpy/files/patch-numpy-f2py-f2py2e.py
==============================================================================
--- head/math/py-numpy/files/patch-numpy-f2py-f2py2e.py	Thu Dec 11 12:52:06 2014	(r374527)
+++ head/math/py-numpy/files/patch-numpy-f2py-f2py2e.py	Thu Dec 11 13:00:44 2014	(r374528)
@@ -1,14 +1,14 @@
---- numpy/f2py/f2py2e.py.orig	2013-10-30 13:31:41.000000000 -0500
-+++ numpy/f2py/f2py2e.py	2014-04-09 10:23:49.000000000 -0500
-@@ -520,6 +520,7 @@
+--- 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 @@
      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','',sources,remove_prefix=0)
++    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
-@@ -555,6 +556,7 @@
+@@ -551,6 +552,7 @@
                  'undef_macros': undef_macros,
                  'extra_objects': extra_objects,
                  'f2py_options': f2py_flags,