[72938] trunk/dports/python/py-sip
jmr at macports.org
jmr at macports.org
Sat Oct 30 09:01:50 PDT 2010
Revision: 72938
http://trac.macports.org/changeset/72938
Author: jmr at macports.org
Date: 2010-10-30 09:01:46 -0700 (Sat, 30 Oct 2010)
Log Message:
-----------
py-sip: fix build (#26658)
Modified Paths:
--------------
trunk/dports/python/py-sip/Portfile
trunk/dports/python/py-sip/files/patch-siputils.py.diff
Modified: trunk/dports/python/py-sip/Portfile
===================================================================
--- trunk/dports/python/py-sip/Portfile 2010-10-30 15:39:42 UTC (rev 72937)
+++ trunk/dports/python/py-sip/Portfile 2010-10-30 16:01:46 UTC (rev 72938)
@@ -49,7 +49,7 @@
post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc
file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}
- xinstall -m 644 -W ${worksrcpath} LICENSE NEWS README TODO \
+ xinstall -m 644 -W ${worksrcpath} LICENSE LICENSE-GPL2 LICENSE-GPL3 NEWS README \
${destroot}${prefix}/share/doc/${name}
system "${prefix}/bin/python2.4 ${prefix}/lib/python2.4/compileall.py ${destroot}${prefix}"
system "${prefix}/bin/python2.4 -O ${prefix}/lib/python2.4/compileall.py ${destroot}${prefix}"
Modified: trunk/dports/python/py-sip/files/patch-siputils.py.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-siputils.py.diff 2010-10-30 15:39:42 UTC (rev 72937)
+++ trunk/dports/python/py-sip/files/patch-siputils.py.diff 2010-10-30 16:01:46 UTC (rev 72938)
@@ -1,19 +1,13 @@
---- siputils.py.org.py 2006-11-04 14:09:43.000000000 -0800
-+++ siputils.py 2006-11-06 20:23:11.000000000 -0800
-@@ -1302,11 +1302,11 @@
- # This allows Apple's Python to be used even if a later python.org
- # version is also installed.
- dl = string.split(sys.exec_prefix, os.sep)
-- try:
-- dl = dl[:dl.index("Python.framework")]
-- except ValueError:
+--- siputils.py.orig 2010-09-03 03:26:37.000000000 +1000
++++ siputils.py 2010-10-31 02:55:12.000000000 +1100
+@@ -1415,8 +1415,8 @@
+ # 'real_prefix' exists if virtualenv is being used.
+ dl = getattr(sys, 'real_prefix', sys.exec_prefix).split(os.sep)
+
+- if "Python.framework" not in dl:
- error("SIP requires Python to be built as a framework")
-- self.LFLAGS.append("-F%s" % string.join(dl, os.sep))
-+ # try:
-+ # dl = dl[:dl.index("Python.framework")]
-+ # except ValueError:
-+ # error("SIP requires Python to be built as a framework")
-+ # self.LFLAGS.append("-F%s" % string.join(dl, os.sep))
- self.LFLAGS.append("-framework Python")
++ #if "Python.framework" not in dl:
++ # error("SIP requires Python to be built as a framework")
- Makefile.finalise(self)
+ self.LFLAGS.append("-undefined dynamic_lookup")
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101030/67abdf2a/attachment.html>
More information about the macports-changes
mailing list