[146609] trunk/dports/lang/pypy

[jmr at macports.org]

Revision: 146609
          https://trac.macports.org/changeset/146609
Author:   jmr at macports.org
Date:     2016-03-13 09:50:42 -0700 (Sun, 13 Mar 2016)
Log Message:
-----------
pypy: patch out undesirable library and include search paths as a precaution, though ours should always be found first

Modified Paths:
--------------
    trunk/dports/lang/pypy/Portfile

Added Paths:
-----------
    trunk/dports/lang/pypy/files/cbuild.py.diff

Modified: trunk/dports/lang/pypy/Portfile
===================================================================
--- trunk/dports/lang/pypy/Portfile	2016-03-13 14:03:29 UTC (rev 146608)
+++ trunk/dports/lang/pypy/Portfile	2016-03-13 16:50:42 UTC (rev 146609)
@@ -34,10 +34,12 @@
 patchfiles          darwin.py.diff \
                     make_output.diff \
                     configure.py.diff \
-                    ffiplatform.py.diff
+                    ffiplatform.py.diff \
+                    cbuild.py.diff
 
 post-patch {
-    reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/lib_pypy/cffi/ffiplatform.py
+    reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/lib_pypy/cffi/ffiplatform.py \
+                                        ${worksrcpath}/ctypes_configure/cbuild.py
 }
 
 use_configure       no

Added: trunk/dports/lang/pypy/files/cbuild.py.diff
===================================================================
--- trunk/dports/lang/pypy/files/cbuild.py.diff	                        (rev 0)
+++ trunk/dports/lang/pypy/files/cbuild.py.diff	2016-03-13 16:50:42 UTC (rev 146609)
@@ -0,0 +1,20 @@
+--- ctypes_configure/cbuild.py.orig	2016-03-10 02:34:50.000000000 +1100
++++ ctypes_configure/cbuild.py	2016-03-14 01:56:29.000000000 +1100
+@@ -208,7 +208,7 @@
+     library_dirs = list(eci.library_dirs)
+     if (sys.platform == 'darwin' or    # support Fink & Darwinports
+             sys.platform.startswith('freebsd')):
+-        for s in ('/sw/', '/opt/local/', '/usr/local/'):
++        for s in ['__PREFIX__']:
+             if s + 'include' not in include_dirs and \
+                os.path.exists(s + 'include'):
+                 include_dirs.append(s + 'include')
+@@ -383,7 +383,7 @@
+             self.link_extra += ['/DEBUG'] # generate .pdb file
+         if (sys.platform == 'darwin' or    # support Fink & Darwinports
+                 sys.platform.startswith('freebsd')):
+-            for s in ('/sw/', '/opt/local/', '/usr/local/'):
++            for s in ['__PREFIX__']:
+                 if s + 'include' not in self.include_dirs and \
+                    os.path.exists(s + 'include'):
+                     self.include_dirs.append(s + 'include')
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160313/52c7f939/attachment.html>