[92766] trunk/dports/devel/mercurial

deric at macports.org deric at macports.org
Sat May 5 17:41:30 PDT 2012


Revision: 92766
          https://trac.macports.org/changeset/92766
Author:   deric at macports.org
Date:     2012-05-05 17:41:28 -0700 (Sat, 05 May 2012)
Log Message:
-----------
mercurial: Removed superfluous reinplace, added patch for setup.py to not clear ARCH-flags, see #34352.

Modified Paths:
--------------
    trunk/dports/devel/mercurial/Portfile

Added Paths:
-----------
    trunk/dports/devel/mercurial/files/patch-setup.py.diff

Modified: trunk/dports/devel/mercurial/Portfile
===================================================================
--- trunk/dports/devel/mercurial/Portfile	2012-05-06 00:22:45 UTC (rev 92765)
+++ trunk/dports/devel/mercurial/Portfile	2012-05-06 00:41:28 UTC (rev 92766)
@@ -31,14 +31,12 @@
                     sha256  ab4ffe751553f852813c21ad73907530ffbc5aa39b0cf962f61fe70f196cbb81
 depends_run         port:curl-ca-bundle
 
+#patchfiles          patch-setup.py.diff
+
 python.default_version 27
 
 variant universal {}
 
-post-patch {
-    reinplace "s/-arch i386 -arch x86_64/[get_canonical_archflags]/" ${worksrcpath}/setup.py
-}
-
 post-destroot {
     # configure ssl certificates
     xinstall -d -m 755 ${destroot}${prefix}/etc/mercurial

Added: trunk/dports/devel/mercurial/files/patch-setup.py.diff
===================================================================
--- trunk/dports/devel/mercurial/files/patch-setup.py.diff	                        (rev 0)
+++ trunk/dports/devel/mercurial/files/patch-setup.py.diff	2012-05-06 00:41:28 UTC (rev 92766)
@@ -0,0 +1,11 @@
+--- setup.py	2012-05-03 23:06:29.000000000 +0200
++++ patch-setup.py	2012-05-06 02:12:06.000000000 +0200
+@@ -470,7 +470,7 @@
+         xcode4 = True
+ 
+     if xcode4:
+-        os.environ['ARCHFLAGS'] = ''
++        pass
+ 
+ setup(name='mercurial',
+       version=setupversion,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120505/d480dd09/attachment.html>


More information about the macports-changes mailing list