Changeset 115137 for trunk/dports/multimedia

Timestamp:

Dec 26, 2013, 2:12:09 AM (6 years ago)

Author:

jeremyhu@…

Message:

misc: Rename cxx_stdlib to cxxstdlib to not conflict with the possible setting in macports.conf

File:

• trunk/dports/multimedia/gtkpod/Portfile (modified) (1 diff)

trunk/dports/multimedia/gtkpod/Portfile

@@ -32 +32 @@
                     path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
 
+# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
 platform darwin {
-    set cxx_stdlib {}
+    set cxxstdlib {}
 
     if {[info exists configure.cxx_stdlib] &&
         ${configure.cxx_stdlib} ne {} &&
         [string match *clang* ${configure.cxx}]} {
-        set cxx_stdlib ${configure.cxx_stdlib}
+        set cxxstdlib ${configure.cxx_stdlib}
     } elseif {[string match *clang* ${configure.cxx}] &&
               ${os.major} >= 13} {
-        set cxx_stdlib libc++
+        set cxxstdlib libc++
     } else {
-        set cxx_stdlib libstdc++
+        set cxxstdlib libstdc++
     }
 
-    if {${cxx_stdlib} eq "libstdc++"} {
+    if {${cxxstdlib} eq "libstdc++"} {
        depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
        depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0