[119475] trunk/dports/python/py-rpy2
stromnov at macports.org
stromnov at macports.org
Sat Apr 26 14:32:31 PDT 2014
Revision: 119475
https://trac.macports.org/changeset/119475
Author: stromnov at macports.org
Date: 2014-04-26 14:32:31 -0700 (Sat, 26 Apr 2014)
Log Message:
-----------
py-rpy2: fix build issue against latest R
Modified Paths:
--------------
trunk/dports/python/py-rpy2/Portfile
Added Paths:
-----------
trunk/dports/python/py-rpy2/files/
trunk/dports/python/py-rpy2/files/patch-setup.py.diff
Modified: trunk/dports/python/py-rpy2/Portfile
===================================================================
--- trunk/dports/python/py-rpy2/Portfile 2014-04-26 20:38:28 UTC (rev 119474)
+++ trunk/dports/python/py-rpy2/Portfile 2014-04-26 21:32:31 UTC (rev 119475)
@@ -43,6 +43,8 @@
# is in MacPorts' binpath, see your macports.conf for details.
depends_lib-append port:R
+ patchfiles-append patch-setup.py.diff
+
livecheck.type none
} else {
livecheck.type regex
Added: trunk/dports/python/py-rpy2/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-rpy2/files/patch-setup.py.diff (rev 0)
+++ trunk/dports/python/py-rpy2/files/patch-setup.py.diff 2014-04-26 21:32:31 UTC (rev 119475)
@@ -0,0 +1,19 @@
+--- setup.py.orig 2014-04-27 00:32:29.000000000 +0400
++++ setup.py 2014-04-27 01:14:19.000000000 +0400
+@@ -274,6 +274,7 @@
+ '^-I(?P<include_dirs>[^ ]+)$',
+ '^(?P<framework_dirs>-F[^ ]+?)$',
+ '^(?P<frameworks>-framework [^ ]+)$',
++ '^(?P<extra_compile_args>-arch [^ ]+)$',
+ '^(?P<extra_link_args>-Wl[^ ]+)$',
+ '^(?P<extra_link_args>-f[^ ]+)$')
+ pp = [re.compile(x) for x in possible_patterns]
+@@ -282,7 +283,7 @@
+ span = (0, 0)
+ rc = RConfig()
+
+- for substring in re.split('(?<!-framework) +', string):
++ for substring in re.split('(?<!-framework)(?<!-arch) +', string):
+ ok = False
+ for pattern in pp:
+ rconfig_m = pattern.match(substring)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140426/ca356b23/attachment.html>
More information about the macports-changes
mailing list