gstreamer1-gst-plugins-bad: Further tighten --disable-cocoa to apply …

…to +universal builds The resulting pkg-config files do not merge and it's incorrect behavior to just pick one. This is a conservative change to favor correctness. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
macports · Jul 22, 2017 · ec9f8c2 · ec9f8c2
1 parent 9fe6415
commit ec9f8c2
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/gnome/gstreamer1-gst-plugins-bad/Portfile b/gnome/gstreamer1-gst-plugins-bad/Portfile
@@ -193,21 +193,28 @@ if {[variant_isset universal]} {
     set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
     set merger_host(i386) i686-apple-${os.platform}${os.major}
     set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
-    set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major} --disable-cocoa
+    set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
 } else {
 
     if {${build_arch} eq "i386"} {
         configure.args-append \
             --host=i686-apple-${os.platform}${os.major} \
-            --build=i686-apple-${os.platform}${os.major} \
-            --disable-cocoa
+            --build=i686-apple-${os.platform}${os.major}
     } elseif {${build_arch} eq "x86_64"} {
         configure.args-append \
             --host=${build_arch}-apple-${os.platform}${os.major} \
             --build=${build_arch}-apple-${os.platform}${os.major}
     }
 }
 
+# In 1.12.1, --enable-cocoa enables ARC code, so we cannot enable it for i386.
+# Remove this in the future if that requirement is removed.
+platform darwin {
+    if {[variant_isset universal] || ${build_arch} eq "i386"} {
+        configure.args-append --disable-cocoa
+    }
+}
+
 livecheck.type      regex
 livecheck.url       ${master_sites}
 livecheck.regex     "${my_name}-(\\d+\\\.\\d*\[02468\](?:\\.\\d+)*)${extract.suffix}"