[108512] trunk/dports

25 Jul 2013

Revision: 108512
          https://trac.macports.org/changeset/108512
Author:   jeremyhu@macports.org
Date:     2013-07-24 23:07:28 -0700 (Wed, 24 Jul 2013)
Log Message:
-----------
Remove compiler dependency hacks now that users should be on base 2.2

Modified Paths:
--------------
    trunk/dports/databases/rethinkdb/Portfile
    trunk/dports/devel/boost/Portfile
    trunk/dports/devel/glib2/Portfile
    trunk/dports/devel/glib2-devel/Portfile
    trunk/dports/lang/rust/Portfile
    trunk/dports/math/cadabra/Portfile
    trunk/dports/science/KlustaKwik/Portfile
    trunk/dports/www/webkit-gtk/Portfile

Modified: trunk/dports/databases/rethinkdb/Portfile
===================================================================

--- trunk/dports/databases/rethinkdb/Portfile	2013-07-25 06:04:25 UTC (rev 108511)
+++ trunk/dports/databases/rethinkdb/Portfile	2013-07-25 06:07:28 UTC (rev 108512)
@@ -43,22 +43,6 @@
 # Xcode 3.2.x included clang but not clang++, so it used llvm-g++-4.2 instead.
 compiler.blacklist-append {clang < 137}
 
-# TODO: Remove when base fallback lists are updated (2.2?).
-compiler.fallback-append macports-clang-3.2
-
-# TODO: Remove when automatic compiler dependencies are released (2.2?).
-if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
-    set compiler $portconfigure::compiler_name_map(${configure.compiler})
-    if {[string first macports-gcc- ${configure.compiler}] == 0} {
-        depends_lib-append              port:${compiler}
-    } else {
-        depends_build-append            port:${compiler}
-    }
-    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
-        depends_skip_archcheck-append   ${compiler}
-    }
-}
-
 set webresdir       ${prefix}/share/${name}/web
 build.args          DEBUG=0 ALLOW_WARNINGS=1 BUILD_DIR=build WEBRESDIR=${webresdir}
 build.target        build/rethinkdb web-assets

Modified: trunk/dports/devel/boost/Portfile
===================================================================
--- trunk/dports/devel/boost/Portfile	2013-07-25 06:04:25 UTC (rev 108511)
+++ trunk/dports/devel/boost/Portfile	2013-07-25 06:07:28 UTC (rev 108512)
@@ -65,16 +65,6 @@
     compiler.blacklist-append clang
 }
 
-# TODO: Remove this block once 2.2 is released
-if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
-    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
-
-    # base 2.1.x ignores the argument and just use ${configure.compiler}
-    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
-        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
-    }
-}
-
 # It turns out that ccache and distcc can produce boost libraries that, although they
 # compile without warning, have all sorts of runtime errors especially with pointer corruption.
 # Since most people will now use MacPorts' pre-compiled boost, this should not be a problem.

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2013-07-25 06:04:25 UTC (rev 108511)
+++ trunk/dports/devel/glib2/Portfile	2013-07-25 06:07:28 UTC (rev 108512)
@@ -57,21 +57,6 @@
 # https://bugzilla.gnome.org/show_bug.cgi?id=697017
 compiler.blacklist-append   gcc-3.3 gcc-4.0 apple-gcc-4.0
 
-# TODO: Remove this block once 2.2 is released
-compiler.fallback-append apple-gcc-4.2
-if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
-    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
-
-    # base 2.1.x ignores the argument and just use ${configure.compiler}
-    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
-        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
-    }
-
-    if {[string match macports-gcc* ${configure.compiler}]} {
-        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
-    }
-}
-
 # -lresolv is needed at least on Tiger PPC.
 configure.ldflags-append    -lresolv \
                             -bind_at_load

Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile	2013-07-25 06:04:25 UTC (rev 108511)
+++ trunk/dports/devel/glib2-devel/Portfile	2013-07-25 06:07:28 UTC (rev 108512)
@@ -56,21 +56,6 @@
 # https://bugzilla.gnome.org/show_bug.cgi?id=697017
 compiler.blacklist-append   gcc-3.3 gcc-4.0 apple-gcc-4.0
 
-# TODO: Remove this block once 2.2 is released
-compiler.fallback-append apple-gcc-4.2
-if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
-    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
-
-    # base 2.1.x ignores the argument and just use ${configure.compiler}
-    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
-        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
-    }
-
-    if {[string match macports-gcc* ${configure.compiler}]} {
-        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
-    }
-}
-
 # -lresolv is needed at least on Tiger PPC.
 configure.ldflags-append    -lresolv \
                             -bind_at_load

Modified: trunk/dports/lang/rust/Portfile
===================================================================
--- trunk/dports/lang/rust/Portfile	2013-07-25 06:04:25 UTC (rev 108511)
+++ trunk/dports/lang/rust/Portfile	2013-07-25 06:07:28 UTC (rev 108512)
@@ -123,26 +123,6 @@
                         bin:python2:python27
 depends_skip_archcheck  python27
 
-# TODO: Remove when automatic compiler dependencies are released (2.2?),
-# but do NOT remove dependency on libstdcxx.
-if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
-    set compiler $portconfigure::compiler_name_map(${configure.compiler})
-    if {[string first macports-gcc- ${configure.compiler}] == 0} {
-        depends_lib-append      port:${compiler} \
-                                {path:lib/libstdc\\+\\+.6.dylib:libstdcxx}
-
-        # The libs for both targets link to libgcc and libstdc++.
-        require_active_variants ${compiler} universal
-        require_active_variants {path:lib/libstdc\\+\\+.6.dylib:libstdcxx} \
-                                    universal
-    } else {
-        depends_build-append    port:${compiler}
-    }
-    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
-        depends_skip_archcheck-append   ${compiler}
-    }
-}
-
 # TODO: Test whether i386 machines can cross-compile for x86_64.
 platform darwin i386 {
     set tgts {i686-apple-darwin x86_64-apple-darwin}

Modified: trunk/dports/math/cadabra/Portfile
===================================================================
--- trunk/dports/math/cadabra/Portfile	2013-07-25 06:04:25 UTC (rev 108511)
+++ trunk/dports/math/cadabra/Portfile	2013-07-25 06:07:28 UTC (rev 108512)
@@ -45,19 +45,6 @@
 # libraries, with malloc failures as a result.
 compiler.whitelist  gcc-4.2 gcc-4.0 apple-gcc-4.2
 
-# TODO: Remove when MacPorts 2.2 is released.
-if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
-    set compiler $portconfigure::compiler_name_map(${configure.compiler})
-    if {[string first macports-gcc- ${configure.compiler}] == 0} {
-        depends_lib-append      port:${compiler}
-    } else {
-        depends_build-append    port:${compiler}
-    }
-    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
-        depends_skip_archcheck-append   ${compiler}
-    }
-}
-
 configure.args      --disable-gui \
                     --disable-runtime-dependency-check
 

Modified: trunk/dports/science/KlustaKwik/Portfile
===================================================================
--- trunk/dports/science/KlustaKwik/Portfile	2013-07-25 06:04:25 UTC (rev 108511)
+++ trunk/dports/science/KlustaKwik/Portfile	2013-07-25 06:07:28 UTC (rev 108512)
@@ -70,14 +70,6 @@
                             apple-gcc-4.2 apple-gcc-4.0 \
                             gcc-4.2 gcc-4.0 gcc-3.3
 
-        # Use MacPorts' clang as fallback compiler.
-        # TODO: Remove when base fallback lists are updated (2.2?).
-        compiler.fallback-append macports-clang-3.2
-        if {${configure.compiler} == "macports-clang-3.2"} {
-            depends_build-append            port:clang-3.2
-            depends_skip_archcheck-append   clang-3.2
-        }
-
         build.target        native
     }
 

Modified: trunk/dports/www/webkit-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit-gtk/Portfile	2013-07-25 06:04:25 UTC (rev 108511)
+++ trunk/dports/www/webkit-gtk/Portfile	2013-07-25 06:07:28 UTC (rev 108512)
@@ -120,21 +120,6 @@
 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 < 300} macports-clang-2.9
 
-# TODO: Remove this block once 2.2 is released
-compiler.fallback-append macports-clang-3.2
-if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
-    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
-
-    # base 2.1.x ignores the argument and just use ${configure.compiler}
-    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
-        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
-    }
-
-    if {[string match macports-gcc* ${configure.compiler}]} {
-        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
-    }
-}
-
 if {[string match *clang* ${configure.compiler}]} {
     configure.cxxflags-append -Wno-c++11-extensions
 }

    

jeremyhu＠macports.org

tags

participants (1)