[135189] trunk/dports/multimedia

ionic at macports.org ionic at macports.org
Sat Apr 18 16:20:00 PDT 2015


Revision: 135189
          https://trac.macports.org/changeset/135189
Author:   ionic at macports.org
Date:     2015-04-18 16:20:00 -0700 (Sat, 18 Apr 2015)
Log Message:
-----------
audacious-{core,plugins}: require libc++ and clang on all platforms.

Modified Paths:
--------------
    trunk/dports/multimedia/audacious-core/Portfile
    trunk/dports/multimedia/audacious-plugins/Portfile

Modified: trunk/dports/multimedia/audacious-core/Portfile
===================================================================
--- trunk/dports/multimedia/audacious-core/Portfile	2015-04-18 21:19:16 UTC (rev 135188)
+++ trunk/dports/multimedia/audacious-core/Portfile	2015-04-18 23:20:00 UTC (rev 135189)
@@ -10,7 +10,7 @@
 
 # Please keep audacious, audacious-core and audacious-plugins synchronized.
 version             3.6.1
-revision            0
+revision            1
 
 license             BSD
 categories          multimedia
@@ -65,43 +65,18 @@
 # A compiler supporting C++11 is required to build audacious and its plugins.
 # The newer, the merrier.
 # Compilers supporting C++11 are GCC >= 4.6 and clang >= 3.3.
+# As we only support libc++, clang is required by implicitly.
+# Blacklist all GCC compilers to not accidentally pull in libstdc++.
 # We do not know what "cc" is, so blacklist it as well.
-compiler.blacklist-append   {*gcc-4.[0-5]} {clang < 500} macports-clang-2.* \
+compiler.blacklist-append   {*gcc*} {clang < 500} macports-clang-2.* \
                             {macports-clang-3.[0-2]} cc
 
 platform darwin {
-    if {${os.major} >= 13} {
-        if {${configure.cxx_stdlib} eq "libc++"} {
-            # Blacklist all GCC compilers to not accidentally pull in libstdc++.
-            compiler.blacklist-append {*gcc*}
-
-            # Make sure binary runs on 10.9+ only.
-            configure.ldflags-append  "-mmacosx-version-min=10.9"
-        } else {
-            ui_error "The system libraries in OS X 10.9 and higher use libc++. Thus, libstdc++ is not supported for this port."
-            error "libstdc++ supported on <= 10.8 only."
+    pre-configure {
+        if {${configure.cxx_stdlib} eq "libstdc++"} {
+            ui_error "This port does not support your selected MacPorts C++ runtime. libc++ must be selected and C++-based ports built against this."
+            error "libstdc++ unsupported."
         }
-    } else {
-        if {${configure.cxx_stdlib} eq "libc++"} {
-            ui_error "The system libraries in OS X 10.8 and lower use libstdc++. Thus, libstdc++ is not supported for this port."
-            error "libc++ supported on >= 10.9 only."
-        } else {
-            # Shameless copy from rust.
-            depends_lib-append          {path:lib/libstdc\\+\\+.6.dylib:libgcc}
-
-            # Force GCC 4.9.
-            compiler.blacklist-append   {*clang*}
-            compiler.fallback-append    macports-gcc-4.9
-
-            # Make sure binary runs on 10.5+ only.
-            configure.ldflags-append    "-mmacosx-version-min=10.5"
-
-            notes-append {
-                            Upstream for some reason requires libc++.
-                            Your build will use libstdc++. The maintainer assumes this
-                            to be OK, but you're on your own if stuff breaks.\
-            }
-        }
     }
 }
 

Modified: trunk/dports/multimedia/audacious-plugins/Portfile
===================================================================
--- trunk/dports/multimedia/audacious-plugins/Portfile	2015-04-18 21:19:16 UTC (rev 135188)
+++ trunk/dports/multimedia/audacious-plugins/Portfile	2015-04-18 23:20:00 UTC (rev 135189)
@@ -9,7 +9,7 @@
 
 # Please keep audacious, audacious-core and audacious-plugins synchronized.
 version             3.6.1
-revision            0
+revision            1
 
 # FIXME: probably more licenses involved here...
 license             BSD GPL-2+
@@ -123,43 +123,18 @@
 # A compiler supporting C++11 is required to build audacious and its plugins.
 # The newer, the merrier.
 # Compilers supporting C++11 are GCC >= 4.6 and clang >= 3.3.
+# As we only support libc++, clang is required by implicitly.
+# Blacklist all GCC compilers to not accidentally pull in libstdc++.
 # We do not know what "cc" is, so blacklist it as well.
-compiler.blacklist-append   {*gcc-4.[0-5]} {clang < 500} macports-clang-2.* \
+compiler.blacklist-append   {*gcc*} {clang < 500} macports-clang-2.* \
                             {macports-clang-3.[0-2]} cc
 
 platform darwin {
-    if {${os.major} >= 13} {
-        if {${configure.cxx_stdlib} eq "libc++"} {
-            # Blacklist all GCC compilers to not accidentally pull in libstdc++.
-            compiler.blacklist-append {*gcc*}
-
-            # Make sure binary runs on 10.9+ only.
-            configure.ldflags-append  "-mmacosx-version-min=10.9"
-        } else {
-            ui_error "The system libraries in OS X 10.9 and higher use libc++. Thus, libstdc++ is not supported for this port."
-            error "libstdc++ supported on <= 10.8 only."
+    pre-configure {
+        if {${configure.cxx_stdlib} eq "libstdc++"} {
+            ui_error "This port does not support your selected MacPorts C++ runtime. libc++ must be selected and C++-based ports built against this."
+            error "libstdc++ unsupported."
         }
-    } else {
-        if {${configure.cxx_stdlib} eq "libc++"} {
-            ui_error "The system libraries in OS X 10.8 and lower use libstdc++. Thus, libstdc++ is not supported for this port."
-            error "libc++ supported on >= 10.9 only."
-        } else {
-            # Shameless copy from rust.
-            depends_lib-append          {path:lib/libstdc\\+\\+.6.dylib:libgcc}
-
-            # Force GCC 4.9.
-            compiler.blacklist-append   {*clang*}
-            compiler.fallback-append    macports-gcc-4.9
-
-            # Make sure binary runs on 10.5+ only.
-            configure.ldflags-append    "-mmacosx-version-min=10.5"
-
-            notes-append {
-                            Upstream for some reason requires libc++.
-                            Your build will use libstdc++. The maintainer assumes this
-                            to be OK, but you're on your own if stuff breaks.\
-            }
-        }
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150418/b42c3912/attachment.html>


More information about the macports-changes mailing list