[136336] trunk/dports/multimedia/mkvtoolnix/Portfile

[ryandesign at macports.org]

Revision: 136336
          https://trac.macports.org/changeset/136336
Author:   ryandesign at macports.org
Date:     2015-05-14 23:06:13 -0700 (Thu, 14 May 2015)
Log Message:
-----------
mkvtoolnix: use cxx11 portgroup to indicate that this port uses C++11 and therefore requires clang and libc++, and no longer attempt to satisfy C++11 requirement by using GCC (#34806); include configure.cxx_stdlib using the usual recipe

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

Modified: trunk/dports/multimedia/mkvtoolnix/Portfile
===================================================================
--- trunk/dports/multimedia/mkvtoolnix/Portfile	2015-05-15 05:52:41 UTC (rev 136335)
+++ trunk/dports/multimedia/mkvtoolnix/Portfile	2015-05-15 06:06:13 UTC (rev 136336)
@@ -3,6 +3,7 @@
 
 PortSystem          1.0
 PortGroup           app 1.0
+PortGroup           cxx11 1.0
 PortGroup           github 1.0
 PortGroup           muniversal 1.0
 PortGroup           wxWidgets 1.0
@@ -56,17 +57,9 @@
                     patch-src-mkvtoolnix-gui-job_widget-mux_job.cpp.diff \
                     patch-clang_errors.diff
 
-platform darwin {
-    if {${os.major} < 13} {
-        if {${configure.cxx_stdlib} eq "libc++"} {
-            configure.ldflags-append "-stdlib=${configure.cxx_stdlib}"
-        } else {
-            # TODO: Need to link against static versions of boost and icu for this to work right
-            #       See: https://trac.macports.org/ticket/40231
-
-            compiler.whitelist macports-gcc-4.8 macports-gcc-4.9 macports-gcc-4.7
-        }
-    }
+set cxx_stdlibflags {}
+if {[string match *clang* ${configure.cxx}]} {
+    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
 }
 
 build.cmd           ./drake
@@ -83,6 +76,8 @@
                     --disable-gui \
                     --disable-wxwidgets
 
+configure.ldflags-append ${cxx_stdlibflags}
+
 app.create          no
 
 variant wxwidgets description {Build with the wxWidgets GUI} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150514/4e6d9dbb/attachment-0001.html>