diff options
Diffstat (limited to 'math/py-rpy/patches/patch-aa')
| -rw-r--r-- | math/py-rpy/patches/patch-aa | 44 |
1 files changed, 32 insertions, 12 deletions
diff --git a/math/py-rpy/patches/patch-aa b/math/py-rpy/patches/patch-aa index d3f6dafe6ac..24b0a1019f9 100644 --- a/math/py-rpy/patches/patch-aa +++ b/math/py-rpy/patches/patch-aa @@ -1,13 +1,33 @@ -$NetBSD: patch-aa,v 1.5 2010/02/15 16:32:20 joerg Exp $ +$NetBSD: patch-aa,v 1.6 2010/06/09 21:04:26 markd Exp $ ---- rpy_tools.py.orig 2006-06-20 19:22:37.000000000 +0000 -+++ rpy_tools.py -@@ -93,7 +93,7 @@ def get_R_VERSION(RHOME=None, force_exec - if stat or len(output)<=0: - raise RuntimeError("Couldn't execute the R interpreter" + - " `%s'.\n" % rexec ) -- version = re.search("R +([0-9]\.[0-9]\.[0-9])", output) -+ version = re.search("R version +([0-9]+\.[0-9]+\.[0-9]+)", output) - if not version: - raise RuntimeError("Couldn't obtain version number from output\n" - "of `R --version'.\n") +--- setup.py.orig 2010-05-16 12:23:30.000000000 +0000 ++++ setup.py +@@ -1,4 +1,11 @@ + + import os, os.path, sys, shutil, re, itertools ++import distutils.sysconfig ++old_customize_compiler = distutils.sysconfig.customize_compiler ++def customize_compiler(compiler): ++ old_customize_compiler(compiler) ++ compiler.set_executables(linker_so=os.environ['FC'] + ' -shared') ++distutils.sysconfig.customize_compiler = customize_compiler ++ + 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') + + for e in self.extensions: +- e.extra_compile_args.extend(extra_link_args) ++ e.extra_link_args.extend(extra_link_args) + + def run(self): + _build_ext.run(self) +@@ -180,6 +187,7 @@ def get_rconfig(r_home, about, allow_emp + #sanity check of what is returned into rconfig + rconfig_m = None + possible_patterns = ('^(-L.+) (-l.+)$', ++ '^(-Wl,-R.+) (-L.+) (-l.+)$', + '^(-l.+)$', # fix for the case -lblas is returned + '^(-F.+? -framework .+)$', # fix for MacOS X + '^(-framework .+)$', |