[102174] trunk/dports
jeremyhu at macports.org
jeremyhu at macports.org
Mon Jan 28 23:53:40 PST 2013
Revision: 102174
https://trac.macports.org/changeset/102174
Author: jeremyhu at macports.org
Date: 2013-01-28 23:53:39 -0800 (Mon, 28 Jan 2013)
Log Message:
-----------
misc: Update compiler dependency workaround for #32542, see #37817
Modified Paths:
--------------
trunk/dports/devel/ld64/Portfile
trunk/dports/devel/ppl/Portfile
trunk/dports/devel/smake/Portfile
trunk/dports/gis/cgal/Portfile
trunk/dports/graphics/opencv/Portfile
trunk/dports/lang/dragonegg-3.0/Portfile
trunk/dports/lang/dragonegg-3.1/Portfile
trunk/dports/lang/dragonegg-3.2/Portfile
trunk/dports/lang/dragonegg-3.3/Portfile
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
trunk/dports/lang/llvm-2.9/Portfile
trunk/dports/lang/llvm-3.0/Portfile
trunk/dports/lang/llvm-3.1/Portfile
trunk/dports/lang/llvm-3.2/Portfile
trunk/dports/lang/llvm-3.3/Portfile
trunk/dports/lang/ruby/Portfile
trunk/dports/multimedia/MPlayer/Portfile
trunk/dports/multimedia/VLC/Portfile
trunk/dports/multimedia/VLC-devel/Portfile
trunk/dports/multimedia/ffmpeg/Portfile
trunk/dports/multimedia/ffmpeg-devel/Portfile
trunk/dports/multimedia/mplayer-devel/Portfile
trunk/dports/multimedia/mythtv-core.25/Portfile
trunk/dports/x11/xorg-xcb-util/Portfile
Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/devel/ld64/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -113,9 +113,17 @@
compiler.blacklist gcc-4.0
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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})
+ }
}
post-extract {
Modified: trunk/dports/devel/ppl/Portfile
===================================================================
--- trunk/dports/devel/ppl/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/devel/ppl/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -41,9 +41,17 @@
compiler.blacklist gcc-4.0
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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}] || [string match "*llvm*" ${configure.compiler}] } {
Modified: trunk/dports/devel/smake/Portfile
===================================================================
--- trunk/dports/devel/smake/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/devel/smake/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -28,9 +28,17 @@
compiler.blacklist-append llvm-gcc-4.2 {clang < 318}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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.type gnu
Modified: trunk/dports/gis/cgal/Portfile
===================================================================
--- trunk/dports/gis/cgal/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/gis/cgal/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -54,9 +54,17 @@
compiler.blacklist-append gcc-4.0
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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})
+ }
}
variant demos description {Create demos} requires qt4 {
Modified: trunk/dports/graphics/opencv/Portfile
===================================================================
--- trunk/dports/graphics/opencv/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/graphics/opencv/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -109,10 +109,18 @@
# Older clang also don't work (#36956)
compiler.blacklist-append {clang < 318}
-# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
- depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
+# 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})
+ }
}
# PCH broken when universal
Modified: trunk/dports/lang/dragonegg-3.0/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.0/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/dragonegg-3.0/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -64,9 +64,17 @@
compiler.blacklist gcc-4.0
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
- depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
- depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
+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})
+ }
}
variant universal {
Modified: trunk/dports/lang/dragonegg-3.1/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.1/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/dragonegg-3.1/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -62,9 +62,17 @@
compiler.blacklist gcc-4.0
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
- depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
- depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
+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})
+ }
}
patchfiles missing-includes.patch cstring.patch
Modified: trunk/dports/lang/dragonegg-3.2/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.2/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/dragonegg-3.2/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -61,9 +61,17 @@
compiler.blacklist gcc-4.0
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
- depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
- depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
+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})
+ }
}
patchfiles missing-includes.patch
Modified: trunk/dports/lang/dragonegg-3.3/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.3/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/dragonegg-3.3/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -61,9 +61,17 @@
compiler.blacklist gcc-4.0
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
- depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
- depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
+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})
+ }
}
patchfiles missing-includes.patch
Modified: trunk/dports/lang/gcc43/Portfile
===================================================================
--- trunk/dports/lang/gcc43/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/gcc43/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -120,9 +120,17 @@
}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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
Modified: trunk/dports/lang/gcc44/Portfile
===================================================================
--- trunk/dports/lang/gcc44/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/gcc44/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -121,9 +121,17 @@
}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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
Modified: trunk/dports/lang/gcc45/Portfile
===================================================================
--- trunk/dports/lang/gcc45/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/gcc45/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -129,9 +129,17 @@
}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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
Modified: trunk/dports/lang/gcc46/Portfile
===================================================================
--- trunk/dports/lang/gcc46/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/gcc46/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -124,9 +124,17 @@
}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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
Modified: trunk/dports/lang/gcc47/Portfile
===================================================================
--- trunk/dports/lang/gcc47/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/gcc47/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -122,9 +122,17 @@
}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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
Modified: trunk/dports/lang/gcc48/Portfile
===================================================================
--- trunk/dports/lang/gcc48/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/gcc48/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -106,9 +106,17 @@
}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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
Modified: trunk/dports/lang/llvm-2.9/Portfile
===================================================================
--- trunk/dports/lang/llvm-2.9/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/llvm-2.9/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -119,9 +119,17 @@
compiler.blacklist gcc-4.0
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
- depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
- depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
+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})
+ }
}
variant universal {
Modified: trunk/dports/lang/llvm-3.0/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.0/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/llvm-3.0/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -118,9 +118,17 @@
compiler.blacklist gcc-4.0
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
- depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
- depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
+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})
+ }
}
variant universal {
Modified: trunk/dports/lang/llvm-3.1/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.1/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/llvm-3.1/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -122,9 +122,17 @@
compiler.blacklist gcc-4.0
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
- depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
- depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
+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})
+ }
}
variant universal {
Modified: trunk/dports/lang/llvm-3.2/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.2/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/llvm-3.2/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -122,9 +122,17 @@
compiler.blacklist gcc-4.0
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
- depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
- depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
+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})
+ }
}
variant universal {
Modified: trunk/dports/lang/llvm-3.3/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.3/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/llvm-3.3/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -110,9 +110,17 @@
compiler.blacklist gcc-4.0
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
- depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
- depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
+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})
+ }
}
variant universal {
Modified: trunk/dports/lang/ruby/Portfile
===================================================================
--- trunk/dports/lang/ruby/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/lang/ruby/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -75,9 +75,17 @@
compiler.blacklist-append llvm-gcc-4.2 macports-llvm-gcc-4.2 {clang < 211}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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}]} {
Modified: trunk/dports/multimedia/MPlayer/Portfile
===================================================================
--- trunk/dports/multimedia/MPlayer/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/multimedia/MPlayer/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -267,9 +267,17 @@
compiler.blacklist-append gcc-4.0 {gcc-4.2 < 5646}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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})
+ }
}
platform darwin 8 {
Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/multimedia/VLC/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -94,9 +94,17 @@
}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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})
+ }
}
# Other
Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -102,9 +102,17 @@
}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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})
+ }
}
# Other
Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -94,9 +94,17 @@
}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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})
+ }
}
# And similarly, disable asm on Tiger
Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -97,9 +97,17 @@
}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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})
+ }
}
# And similarly, disable asm on Tiger
Modified: trunk/dports/multimedia/mplayer-devel/Portfile
===================================================================
--- trunk/dports/multimedia/mplayer-devel/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/multimedia/mplayer-devel/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -278,9 +278,17 @@
compiler.blacklist-append gcc-4.0 {gcc-4.2 < 5646}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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})
+ }
}
platform darwin 8 {
Modified: trunk/dports/multimedia/mythtv-core.25/Portfile
===================================================================
--- trunk/dports/multimedia/mythtv-core.25/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/multimedia/mythtv-core.25/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -92,7 +92,7 @@
}
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+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}
Modified: trunk/dports/x11/xorg-xcb-util/Portfile
===================================================================
--- trunk/dports/x11/xorg-xcb-util/Portfile 2013-01-29 07:41:17 UTC (rev 102173)
+++ trunk/dports/x11/xorg-xcb-util/Portfile 2013-01-29 07:53:39 UTC (rev 102174)
@@ -27,9 +27,17 @@
compiler.blacklist gcc-4.0
# TODO: base should do this: http://trac.macports.org/ticket/32542
-if {[portconfigure::compiler_is_port ${configure.compiler}]} {
+if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
- depends_skip_archcheck-append $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})
+ }
}
livecheck.type regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130128/2a46ed15/attachment-0001.html>
More information about the macports-changes
mailing list