[141539] trunk/dports/multimedia/mlt/Portfile

ryandesign at macports.org ryandesign at macports.org
Sat Dec 12 01:57:34 PST 2015


Revision: 141539
          https://trac.macports.org/changeset/141539
Author:   ryandesign at macports.org
Date:     2015-10-20 05:29:28 -0700 (Tue, 20 Oct 2015)
Log Message:
-----------
mlt: use the right -arch flags and add universal variant (#47595)

Modified Paths:
--------------
    trunk/dports/multimedia/mlt/Portfile

Modified: trunk/dports/multimedia/mlt/Portfile
===================================================================
--- trunk/dports/multimedia/mlt/Portfile	2015-10-20 12:25:00 UTC (rev 141538)
+++ trunk/dports/multimedia/mlt/Portfile	2015-10-20 12:29:28 UTC (rev 141539)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           muniversal 1.0
 PortGroup           qt4 1.0
 
 name                mlt
@@ -28,9 +29,6 @@
 checksums           rmd160  c678a40b0fa362043d2a867152702cd8375d7bc7 \
                     sha256 ab999992828a03dadbf62f6a131aada776cfd7afe63a94d994877fdba31a3000 
 
-# frei0r-plugins is not universal
-universal_variant   no
-
 depends_build-append port:git \
                     port:doxygen
 
@@ -62,11 +60,20 @@
 configure.cflags-append     "-I${prefix}/include"
 configure.cflags-append     "-I${qt_includes_dir}"
 configure.ldflags-delete    "-L${prefix}/lib"
-configure.ldflags-append    "-L${worksrcpath}/src/framework"
-configure.ldflags-append    "-L${prefix}/lib"
-build.env-append            CFLAGS="${configure.cflags}" LDFLAGS="${configure.ldflags}"
+
 build.args-append           CC="${configure.cc}" CXX="${configure.cxx}" CPP="${configure.cpp}"
 
+if {[variant_isset universal]} {
+    foreach arch ${configure.universal_archs} {
+        lappend merger_build_env(${arch})   {*}"CFLAGS='${configure.cflags} -arch ${arch}'"
+        lappend merger_build_env(${arch})   {*}"CXXFLAGS='${configure.cxxflags} -arch ${arch}'"
+        lappend merger_build_env(${arch})   {*}"LDFLAGS='${configure.ldflags} -L${worksrcpath}-${arch}/src/framework -L${prefix}/lib -arch ${arch}'"
+    }
+} else {
+    build.env-append                        CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
+    build.env-append                        CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]"
+    build.env-append                        LDFLAGS="${configure.ldflags} -L${worksrcpath}/src/framework -L${prefix}/lib [get_canonical_archflags ld]"
+}
 
 variant gtk2 description {include the gtk2 module (for additional image and text producers)} {
     configure.args-delete   --disable-gtk2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/6b117393/attachment.html>


More information about the macports-changes mailing list