Tue Jan 27 05:04:06 2015 UTC ()
use the Accelerate framework on Darwin instead of the obsolete vecLib
(dbj)
diff -r1.15 -r1.16 pkgsrc/math/py-Numeric/distinfo
diff -r1.10 -r0 pkgsrc/math/py-Numeric/patches/patch-ab
diff -r0 -r1.1 pkgsrc/math/py-Numeric/patches/patch-setup.py
--- pkgsrc/math/py-Numeric/Attic/distinfo 2007/12/27 14:07:25 1.15
+++ pkgsrc/math/py-Numeric/Attic/distinfo 2015/01/27 05:04:06 1.16
| @@ -1,8 +1,8 @@ | | | @@ -1,8 +1,8 @@ |
1 | $NetBSD: distinfo,v 1.15 2007/12/27 14:07:25 joerg Exp $ | | 1 | $NetBSD: distinfo,v 1.16 2015/01/27 05:04:06 dbj Exp $ |
2 | | | 2 | |
3 | SHA1 (Numeric-24.2.tar.gz) = 72869ef80c12630a9a125ba10c96093b6ae16aff | | 3 | SHA1 (Numeric-24.2.tar.gz) = 72869ef80c12630a9a125ba10c96093b6ae16aff |
4 | RMD160 (Numeric-24.2.tar.gz) = c9502db28663558c535e236392c9beddec9743bb | | 4 | RMD160 (Numeric-24.2.tar.gz) = c9502db28663558c535e236392c9beddec9743bb |
5 | Size (Numeric-24.2.tar.gz) = 743800 bytes | | 5 | Size (Numeric-24.2.tar.gz) = 743800 bytes |
6 | SHA1 (patch-aa) = 31920706522b5730644da8191e0c1c8191d4add1 | | 6 | SHA1 (patch-aa) = 31920706522b5730644da8191e0c1c8191d4add1 |
7 | SHA1 (patch-ab) = 35dd9debd94e9cea059d0802149192e7ecdcf938 | | | |
8 | SHA1 (patch-ac) = 45ca40e38123dc72ec42b3775b2401c0037674c0 | | 7 | SHA1 (patch-ac) = 45ca40e38123dc72ec42b3775b2401c0037674c0 |
| | | 8 | SHA1 (patch-setup.py) = a7dab66b75c2bb5a75e8d841ef2ebe15d8b7176c |
$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