Ticket #25939: libvpx-universal.diff

Portfile

@@ -2 +2 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup       muniversal 1.0
 
 name            libvpx
 version         0.9.1
@@ -24 +25 @@
 
 depends_build   port:yasm
 
-# gcc-4.2: -E, -S, -save-temps and -M options are not allowed with multiple -arch flags
-universal_variant no
-
 # patches for: 10.6; correct "universal" arch default selection; 'sed' scripts.
 patchfiles      patch-build-make-configure.sh.diff \
                 patch-configure.diff
@@ -55 +53 @@
 build.args      verbose=1
 
 # set configure parameters depending on if universal or not
-if {![variant_isset universal] || ![variant_exists universal]} {
-    # specify only the single target, otherwise 'configure' will try
-    # for a 'universal' install.
-    switch ${build_arch} {
-        i386    { set tgt_isa x86           }
-        ppc     { set tgt_isa ppc32         }
-        default { set tgt_isa ${build_arch} }
-    }
-    configure.args-append --target=${tgt_isa}-${os.platform}${os.major}-gcc
-} else {
+set my_targets(ppc)     ppc32
+set my_targets(ppc64)   ppc64
+set my_targets(i386)    x86
+set my_targets(x86_64)  x86_64
+if {[variant_isset universal]} {
     # clear universal flags; configure will determine them.
     configure.universal_cppflags
     configure.universal_cflags
     configure.universal_cxxflags
     configure.universal_ldflags
-    # tell configure the target; probably not necessary
-    configure.args-append --target=universal-${os.platform}${os.major}-gcc
+    configure.universal_args-delete --disable-dependency-tracking
+    foreach my_arch ${configure.universal_archs} {
+        set merger_configure_args(${my_arch}) --target=$my_targets(${my_arch})-${os.platform}${os.major}-gcc
+    }
+} else {
+    # specify only the single target, otherwise 'configure' will try
+    # for a universal install.
+    configure.args-append --target=$my_targets(${build_arch})-${os.platform}${os.major}-gcc
 }