[79548] trunk/dports/devel/mercurial/Portfile

[Ryan Schmidt]

On Jun 17, 2011, at 18:41, jeremyhu at macports.org wrote:

> Revision: 79548
>          http://trac.macports.org/changeset/79548
> Author:   jeremyhu at macports.org
> Date:     2011-06-17 16:41:09 -0700 (Fri, 17 Jun 2011)
> Log Message:
> -----------
> mercurial: Build fix for -universal variant
> 
> Modified Paths:
> --------------
>    trunk/dports/devel/mercurial/Portfile
> 
> Modified: trunk/dports/devel/mercurial/Portfile
> ===================================================================
> --- trunk/dports/devel/mercurial/Portfile	2011-06-17 22:12:38 UTC (rev 79547)
> +++ trunk/dports/devel/mercurial/Portfile	2011-06-17 23:41:09 UTC (rev 79548)
> @@ -32,6 +32,14 @@
>                     rmd160  c9c21ac48e6c37360f4de5833ddf0ee5e2594620
> depends_run         port:curl-ca-bundle
> 
> +post-patch {
> +    if {[variant_isset universal]} {
> +        reinplace "s/-arch i386 -arch x86_64/${configure.universal_cflags}/" ${worksrcpath}/setup.py
> +    } else {
> +        reinplace "s/-arch i386 -arch x86_64//" ${worksrcpath}/setup.py
> +    }
> +}

In the non-universal case, shouldn't you reinplace with ${configure.cc_archflags} instead of the empty string?

Also this is not an openmaintainer port. Did Deric approve this change? Was there a ticket for this issue?

You probably already know, but for those who don't, this code is in a conditional that only affects Xcode 4 and up.