[102942] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Sun Feb 10 18:46:02 PST 2013
Revision: 102942
https://trac.macports.org/changeset/102942
Author: jeremyhu at macports.org
Date: 2013-02-10 18:46:02 -0800 (Sun, 10 Feb 2013)
Log Message:
-----------
gcc*: Use compiler_blacklist_versions
Modified Paths:
--------------
trunk/dports/lang/gcc43/Portfile
trunk/dports/lang/gcc44/Portfile
trunk/dports/lang/gcc45/Portfile
trunk/dports/lang/gcc46/Portfile
trunk/dports/lang/gcc47/Portfile
trunk/dports/lang/gcc48/Portfile
Modified: trunk/dports/lang/gcc43/Portfile
===================================================================
--- trunk/dports/lang/gcc43/Portfile 2013-02-11 02:45:32 UTC (rev 102941)
+++ trunk/dports/lang/gcc43/Portfile 2013-02-11 02:46:02 UTC (rev 102942)
@@ -2,6 +2,7 @@
PortSystem 1.0
PortGroup select 1.0
+PortGroup compiler_blacklist_versions 1.0
name gcc43
version 4.3.6
@@ -115,24 +116,8 @@
compiler.blacklist-append gcc-4.0
# http://trac.macports.org/ticket/29104
-if {[vercmp $xcodeversion 4.2] < 0} {
- compiler.blacklist-append llvm-gcc-4.2
-}
+compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
-# TODO: base should do this: http://trac.macports.org/ticket/32542
-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})
- }
-}
-
# STAGE1_CFLAGS="-O2 -fkeep-inline-functions" : from configure.ac
# BOOT_CFLAGS="-O2 -g" : from Makefile.tpl
# -std=gnu89 : for building with clang
Modified: trunk/dports/lang/gcc44/Portfile
===================================================================
--- trunk/dports/lang/gcc44/Portfile 2013-02-11 02:45:32 UTC (rev 102941)
+++ trunk/dports/lang/gcc44/Portfile 2013-02-11 02:46:02 UTC (rev 102942)
@@ -2,6 +2,7 @@
PortSystem 1.0
PortGroup select 1.0
+PortGroup compiler_blacklist_versions 1.0
name gcc44
epoch 1
@@ -116,24 +117,8 @@
compiler.blacklist-append gcc-4.0
# http://trac.macports.org/ticket/29104
-if {[vercmp $xcodeversion 4.2] < 0} {
- compiler.blacklist-append llvm-gcc-4.2
-}
+compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
-# TODO: base should do this: http://trac.macports.org/ticket/32542
-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})
- }
-}
-
# STAGE1_CFLAGS="-O2 -fkeep-inline-functions" : from configure.ac
# BOOT_CFLAGS="-O2 -g" : from Makefile.tpl
# -std=gnu89 : for building with clang
Modified: trunk/dports/lang/gcc45/Portfile
===================================================================
--- trunk/dports/lang/gcc45/Portfile 2013-02-11 02:45:32 UTC (rev 102941)
+++ trunk/dports/lang/gcc45/Portfile 2013-02-11 02:46:02 UTC (rev 102942)
@@ -2,6 +2,7 @@
PortSystem 1.0
PortGroup select 1.0
+PortGroup compiler_blacklist_versions 1.0
name gcc45
epoch 1
@@ -124,24 +125,8 @@
compiler.blacklist-append gcc-4.0
# http://trac.macports.org/ticket/29104
-if {[vercmp $xcodeversion 4.2] < 0} {
- compiler.blacklist-append llvm-gcc-4.2
-}
+compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
-# TODO: base should do this: http://trac.macports.org/ticket/32542
-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})
- }
-}
-
# LTO doesn't work for other targets, see ticket #32863
if {![variant_isset universal] && $build_arch == "x86_64"} {
configure.args-append --enable-lto
Modified: trunk/dports/lang/gcc46/Portfile
===================================================================
--- trunk/dports/lang/gcc46/Portfile 2013-02-11 02:45:32 UTC (rev 102941)
+++ trunk/dports/lang/gcc46/Portfile 2013-02-11 02:46:02 UTC (rev 102942)
@@ -2,6 +2,7 @@
PortSystem 1.0
PortGroup select 1.0
+PortGroup compiler_blacklist_versions 1.0
name gcc46
epoch 1
@@ -119,24 +120,8 @@
compiler.blacklist-append gcc-4.0
# http://trac.macports.org/ticket/29104
-if {[vercmp $xcodeversion 4.2] < 0} {
- compiler.blacklist-append llvm-gcc-4.2
-}
+compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
-# TODO: base should do this: http://trac.macports.org/ticket/32542
-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})
- }
-}
-
build.target bootstrap
use_parallel_build yes
Modified: trunk/dports/lang/gcc47/Portfile
===================================================================
--- trunk/dports/lang/gcc47/Portfile 2013-02-11 02:45:32 UTC (rev 102941)
+++ trunk/dports/lang/gcc47/Portfile 2013-02-11 02:46:02 UTC (rev 102942)
@@ -3,6 +3,7 @@
PortSystem 1.0
PortGroup select 1.0
+PortGroup compiler_blacklist_versions 1.0
name gcc47
subport libstdcxx {}
@@ -117,24 +118,8 @@
compiler.blacklist-append gcc-4.0
# http://trac.macports.org/ticket/29104
-if {[vercmp $xcodeversion 4.2] < 0} {
- compiler.blacklist-append llvm-gcc-4.2
-}
+compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
-# TODO: base should do this: http://trac.macports.org/ticket/32542
-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})
- }
-}
-
build.target bootstrap
use_parallel_build yes
Modified: trunk/dports/lang/gcc48/Portfile
===================================================================
--- trunk/dports/lang/gcc48/Portfile 2013-02-11 02:45:32 UTC (rev 102941)
+++ trunk/dports/lang/gcc48/Portfile 2013-02-11 02:46:02 UTC (rev 102942)
@@ -2,6 +2,7 @@
PortSystem 1.0
PortGroup select 1.0
+PortGroup compiler_blacklist_versions 1.0
name gcc48
subport libstdcxx-devel {}
@@ -101,24 +102,8 @@
compiler.blacklist-append gcc-4.0
# http://trac.macports.org/ticket/29104
-if {[vercmp $xcodeversion 4.2] < 0} {
- compiler.blacklist-append llvm-gcc-4.2
-}
+compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
-# TODO: base should do this: http://trac.macports.org/ticket/32542
-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})
- }
-}
-
build.target bootstrap
use_parallel_build yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130210/2d8314a0/attachment.html>
More information about the macports-changes
mailing list