use the Accelerate framework on Darwin instead of the obsolete vecLib

3 files changed, 61 insertions, 21 deletions

diff --git a/math/py-Numeric/distinfo b/math/py-Numeric/distinfo
index 3c5fd33ab5b..f7a76a9d5fc 100644
--- a/math/py-Numeric/distinfo
+++ b/math/py-Numeric/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2007/12/27 14:07:25 joerg Exp $
+$NetBSD: distinfo,v 1.16 2015/01/27 05:04:06 dbj Exp $
 
 SHA1 (Numeric-24.2.tar.gz) = 72869ef80c12630a9a125ba10c96093b6ae16aff
 RMD160 (Numeric-24.2.tar.gz) = c9502db28663558c535e236392c9beddec9743bb
 Size (Numeric-24.2.tar.gz) = 743800 bytes
 SHA1 (patch-aa) = 31920706522b5730644da8191e0c1c8191d4add1
-SHA1 (patch-ab) = 35dd9debd94e9cea059d0802149192e7ecdcf938
 SHA1 (patch-ac) = 45ca40e38123dc72ec42b3775b2401c0037674c0
+SHA1 (patch-setup.py) = a7dab66b75c2bb5a75e8d841ef2ebe15d8b7176c
diff --git a/math/py-Numeric/patches/patch-ab b/math/py-Numeric/patches/patch-ab
deleted file mode 100644
index 52d377b051b..00000000000
--- a/math/py-Numeric/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2007/12/27 14:07:25 joerg Exp $
-
---- setup.py.orig	2007-12-21 23:31:57.000000000 +0100
-+++ setup.py
-@@ -15,12 +15,8 @@ if not hasattr(sys, 'version_info') or s
-     raise SystemExit, "Python 2.0 or later required to build Numeric."
- 
- from glob import glob
--try:
--    from setuptools import setup
--    have_setuptools = 1
--except ImportError:
--    from distutils.core import setup
--    have_setuptools = 0
-+from distutils.core import setup
-+have_setuptools = 0
- from distutils.core import Extension
- from distutils.command.config import config
- from distutils.sysconfig import get_config_var, customize_compiler
diff --git a/math/py-Numeric/patches/patch-setup.py b/math/py-Numeric/patches/patch-setup.py
new file mode 100644
index 00000000000..ad182795929
--- /dev/null
+++ b/math/py-Numeric/patches/patch-setup.py
@@ -0,0 +1,59 @@
+$NetBSD: patch-setup.py,v 1.1 2015/01/27 05:04:06 dbj Exp $
+
+--- setup.py.orig	2005-11-11 08:56:59.000000000 +0000
++++ setup.py
+@@ -15,12 +15,8 @@ if not hasattr(sys, 'version_info') or s
+     raise SystemExit, "Python 2.0 or later required to build Numeric."
+ 
+ from glob import glob
+-try:
+-    from setuptools import setup
+-    have_setuptools = 1
+-except ImportError:
+-    from distutils.core import setup
+-    have_setuptools = 0
++from distutils.core import setup
++have_setuptools = 0
+ from distutils.core import Extension
+ from distutils.command.config import config
+ from distutils.sysconfig import get_config_var, customize_compiler
+@@ -128,10 +124,10 @@ elif sys.platform in ['mac', 'beos5']:
+ if os.path.isfile(os.path.join("Src","config.h")):
+     extra_compile_args.append('-DHAVE_CONFIG')
+ 
+-# For Mac OS X >= 10.2, an optimized BLAS and most of LAPACK (all the
++# For Mac OS X >= 10.3, an optimized BLAS and most of LAPACK (all the
+ # routines we need, at least) should already be installed
+-VECLIB_PATH = '/System/Library/Frameworks/vecLib.framework'
+-have_veclib = os.path.exists(VECLIB_PATH)
++ACCELERATE_PATH = '/System/Library/Frameworks/Accelerate.framework'
++have_accelerate = os.path.exists(ACCELERATE_PATH)
+ 
+ def extension(name, sources, **kw):
+     def prepend(name, value, kw=kw):
+@@ -146,8 +142,8 @@ lapack_source = [path('Src/lapack_litemo
+ lapack_link_args = customize.lapack_extra_link_args
+ if customize.use_system_lapack:
+     pass
+-elif have_veclib:
+-    lapack_link_args.extend(['-framework', 'vecLib'])
++elif have_accelerate:
++    lapack_link_args.extend(['-framework', 'Accelerate'])
+ else:
+     lapack_source.extend([path('Src/f2c_lite.c'),
+                           path('Src/zlapack_lite.c'),
+@@ -172,11 +168,10 @@ if customize.use_dotblas:
+                                             customize.dotblas_cblas_header)],
+                             extra_link_args=customize.dotblas_extra_link_args,
+                            )
+-elif have_veclib:
++elif have_accelerate:
+     dotblas_ext = extension('_dotblas', dotblas_source,
+-                            include_dirs=[os.path.join(VECLIB_PATH, 'Headers')],
+-                            define_macros=[('CBLAS_HEADER', '<cblas.h>')],
+-                            extra_link_args=['-framework', 'vecLib'],
++                            define_macros=[('CBLAS_HEADER', '<Accelerate/Accelerate.h>')],
++                            extra_link_args=['-framework', 'Accelerate'],
+                            )
+ else:
+     dotblas_ext = None