[145334] trunk/dports/www

2 Feb 2016

Revision: 145334
          https://trac.macports.org/changeset/145334
Author:   jeremyhu@macports.org
Date:     2016-02-01 16:21:34 -0800 (Mon, 01 Feb 2016)
Log Message:
-----------
webkit*-gtk*: Use the cxx11 portgroup

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk/Portfile
    trunk/dports/www/webkit2-gtk/Portfile
    trunk/dports/www/webkit2-gtk-devel/Portfile

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================

--- trunk/dports/www/webkit-gtk/Portfile	2016-02-02 00:08:27 UTC (rev 145333)
+++ trunk/dports/www/webkit-gtk/Portfile	2016-02-02 00:21:34 UTC (rev 145334)
@@ -9,6 +9,7 @@
 PortGroup           conflicts_build 1.0
 PortGroup           muniversal 1.0
 PortGroup           compiler_blacklist_versions 1.0
+PortGroup           cxx11 1.0
 
 name                webkit-gtk
 epoch               2
@@ -95,15 +96,6 @@
                     --enable-webgl \
                     --disable-jit
 
-platform darwin {
-    pre-configure {
-        if {${configure.cxx_stdlib} eq "libstdc++"} {
-            ui_error "${subport} is not supported for this installation of MacPorts.  It requires libc++ be selected as your C++ runtime.  Please use ${subport}-2.0 instead"
-            error "unsupported configuration"
-        }
-    }
-}
-
 subport webkit-gtk3 {
     conflicts webkit-gtk3-devel webkit-gtk3-2.0
     depends_lib-append      port:gtk3
@@ -146,11 +138,6 @@
 # https://bugs.webkit.org/show_bug.cgi?id=94488
 configure.universal_args-delete --disable-dependency-tracking
 
-# configure checks that we're clang 3.2, gcc 4.7, or better
-compiler.blacklist-append gcc-3.3 gcc-4.0 apple-gcc-4.0 gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
-compiler.blacklist-append macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6
-compiler.blacklist-append {clang < 425}
-
 # gobject-introspection uses g-ir-scanner, which uses $CC from env
 if {[variant_isset universal]} {
     foreach arch ${configure.universal_archs} {

Modified: trunk/dports/www/webkit2-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk/Portfile	2016-02-02 00:08:27 UTC (rev 145333)
+++ trunk/dports/www/webkit2-gtk/Portfile	2016-02-02 00:21:34 UTC (rev 145334)
@@ -8,6 +8,7 @@
 PortSystem          1.0
 PortGroup           compiler_blacklist_versions 1.0
 PortGroup           cmake 1.0
+PortGroup           cxx11 1.0
 
 name                webkit2-gtk
 conflicts           webkit2-gtk-devel
@@ -150,20 +151,6 @@
         ${build.dir}/Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt
 }
 
-platform darwin {
-    pre-configure {
-        if {${configure.cxx_stdlib} eq "libstdc++"} {
-            ui_error "${subport} is not supported for this installation of MacPorts.  It requires libc++ be selected as your C++ runtime."
-            error "unsupported configuration"
-        }
-    }
-}
-
-# configure checks that we're clang 3.2, gcc 4.7, or better
-compiler.blacklist-append gcc-3.3 gcc-4.0 apple-gcc-4.0 gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
-compiler.blacklist-append macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6
-compiler.blacklist-append {clang < 425}
-
 # https://trac.macports.org/ticket/41560#comment:2
 configure.cflags-append     -ftemplate-depth=256
 configure.cxxflags-append   -ftemplate-depth=256

Modified: trunk/dports/www/webkit2-gtk-devel/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk-devel/Portfile	2016-02-02 00:08:27 UTC (rev 145333)
+++ trunk/dports/www/webkit2-gtk-devel/Portfile	2016-02-02 00:21:34 UTC (rev 145334)
@@ -8,6 +8,7 @@
 PortSystem          1.0
 PortGroup           compiler_blacklist_versions 1.0
 PortGroup           cmake 1.0
+PortGroup           cxx11 1.0
 
 name                webkit2-gtk-devel
 conflicts           webkit2-gtk
@@ -142,20 +143,6 @@
         ${build.dir}/Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt
 }
 
-platform darwin {
-    pre-configure {
-        if {${configure.cxx_stdlib} eq "libstdc++"} {
-            ui_error "${subport} is not supported for this installation of MacPorts.  It requires libc++ be selected as your C++ runtime."
-            error "unsupported configuration"
-        }
-    }
-}
-
-# configure checks that we're clang 3.2, gcc 4.7, or better
-compiler.blacklist-append gcc-3.3 gcc-4.0 apple-gcc-4.0 gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
-compiler.blacklist-append macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6
-compiler.blacklist-append {clang < 425}
-
 # https://trac.macports.org/ticket/41560#comment:2
 configure.cflags-append     -ftemplate-depth=256
 configure.cxxflags-append   -ftemplate-depth=256

    

jeremyhu＠macports.org

tags

participants (1)