diff options
| author | dholland <dholland@pkgsrc.org> | 2011-12-18 21:32:08 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2011-12-18 21:32:08 +0000 |
| commit | ab624e808ff15229d22b6ffc4caec9eb5b69b8e2 (patch) | |
| tree | 0db9d8a8467a27c958e2950a0b359e5bfef2b53f | |
| parent | b9dd82cf53b6b7f264203a58969bdc127e8a4165 (diff) | |
| download | pkgsrc-ab624e808ff15229d22b6ffc4caec9eb5b69b8e2.tar.gz | |
If BLAS_LIBS comes back empty, run with it instead of detonating.
This makes it build for me.
| -rw-r--r-- | math/py-rpy/distinfo | 4 | ||||
| -rw-r--r-- | math/py-rpy/patches/patch-aa | 18 |
2 files changed, 16 insertions, 6 deletions
diff --git a/math/py-rpy/distinfo b/math/py-rpy/distinfo index 4b9015b6321..e05bea878d8 100644 --- a/math/py-rpy/distinfo +++ b/math/py-rpy/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.9 2010/06/09 21:04:26 markd Exp $ +$NetBSD: distinfo,v 1.10 2011/12/18 21:32:08 dholland Exp $ SHA1 (rpy2-2.1.3.tar.gz) = cf067b0fbcc9589b442538ee89273e61973c6207 RMD160 (rpy2-2.1.3.tar.gz) = fb9354770fbbda39e07603f616bd9852f9573bc8 Size (rpy2-2.1.3.tar.gz) = 127887 bytes -SHA1 (patch-aa) = 5379b7bb276991e5180ef58ce0f721524603ed9b +SHA1 (patch-aa) = 5ea826e4ec3d09feb4249e94f17e9e3115f70abf diff --git a/math/py-rpy/patches/patch-aa b/math/py-rpy/patches/patch-aa index 24b0a1019f9..dc17299deb8 100644 --- a/math/py-rpy/patches/patch-aa +++ b/math/py-rpy/patches/patch-aa @@ -1,8 +1,13 @@ -$NetBSD: patch-aa,v 1.6 2010/06/09 21:04:26 markd Exp $ +$NetBSD: patch-aa,v 1.7 2011/12/18 21:32:08 dholland Exp $ + +- configure compiler for pkgsrc +- allow BLAS_LIBS to be empty +- handle extra_link_args correctly +- accept pkgsrc-reported link args --- setup.py.orig 2010-05-16 12:23:30.000000000 +0000 +++ setup.py -@@ -1,4 +1,11 @@ +@@ -1,5 +1,12 @@ import os, os.path, sys, shutil, re, itertools +import distutils.sysconfig @@ -14,8 +19,13 @@ $NetBSD: patch-aa,v 1.6 2010/06/09 21:04:26 markd Exp $ + from distutils.command.build_ext import build_ext as _build_ext from distutils.command.build import build as _build -@@ -133,7 +140,7 @@ class build_ext(_build_ext): - get_rconfig(r_home, 'BLAS_LIBS') + +@@ -130,10 +137,10 @@ class build_ext(_build_ext): + extra_link_args = get_rconfig(r_home, '--ldflags') +\ + get_rconfig(r_home, 'LAPACK_LIBS', + allow_empty=True) +\ +- get_rconfig(r_home, 'BLAS_LIBS') ++ get_rconfig(r_home, 'BLAS_LIBS', allow_empty=True) for e in self.extensions: - e.extra_compile_args.extend(extra_link_args) |