[91893] trunk/dports/graphics/lensfun/Portfile

[Ryan Schmidt]

On Apr 12, 2012, at 15:36, jeremyhu at macports.org wrote:

> Revision: 91893
>          https://trac.macports.org/changeset/91893
> Author:   jeremyhu at macports.org
> Date:     2012-04-12 13:36:58 -0700 (Thu, 12 Apr 2012)
> Log Message:
> -----------
> lensfun: Use the right linker, and fix +universal.  Dev ack over email.
> 
> Modified Paths:
> --------------
>    trunk/dports/graphics/lensfun/Portfile
> 
> Modified: trunk/dports/graphics/lensfun/Portfile
> ===================================================================
> --- trunk/dports/graphics/lensfun/Portfile	2012-04-12 20:00:13 UTC (rev 91892)
> +++ trunk/dports/graphics/lensfun/Portfile	2012-04-12 20:36:58 UTC (rev 91893)
> @@ -2,6 +2,7 @@
> # $Id$
> 
> PortSystem          1.0
> +PortGroup           muniversal 1.0
> 
> name                lensfun
> version             0.2.5
> @@ -34,8 +35,6 @@
> 
> configure.args      -v
> 
> -configure.env       LD=${configure.cxx}
> -
> platform darwin 8 {
>     # lensfun requires make >= 3.81; Tiger comes with 3.80
>     depends_build-append port:gmake
> @@ -49,14 +48,24 @@
>     build.cmd ${prefix}/bin/gmake
> }
> 
> -platform powerpc {
> -    configure.args-append --target=mac.powerpc.powerpc \
> -                          --vectorization=''
> +if {[variant_isset universal]} {
> +    foreach arch ${configure.universal_archs} {
> +        set merger_host($arch) ""
> +    }
> +    set merger_configure_args(ppc)    "--target=mac.powerpc.powerpc --vectorization=''"
> +    set merger_configure_args(i386)   "--target=mac.x86.i686"
> +    set merger_configure_args(x86_64) "--target=mac.x86_64.generic"
> +} elseif {${build_arch} == "ppc"} {
> +    configure.args-append --target=mac.powerpc.powerpc --vectorization=''
> +} elseif {${build_arch} == "i386"} {
> +    configure.args-append --target=mac.x86.i686
> +} elseif {${build_arch} == "x86_64"} {
> +    configure.args-append --target=mac.x86_64.generic
> }

In the old code, ppc64 was getting "--target=mac.powerpc.powerpc --vectorization=''" too; now it's not. Was that change intended?