[89315] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Tue Jan 24 14:31:47 PST 2012
Revision: 89315
http://trac.macports.org/changeset/89315
Author: ryandesign at macports.org
Date: 2012-01-24 14:31:47 -0800 (Tue, 24 Jan 2012)
Log Message:
-----------
Use new gcc-4.2 compiler selection block recommended at wiki:PortfileRecipes#compiler
Modified Paths:
--------------
trunk/dports/aqua/HandBrake/Portfile
trunk/dports/cross/i386-mingw32-gcc/Portfile
trunk/dports/emulators/qemu/Portfile
trunk/dports/lang/ghc/Portfile
trunk/dports/lang/ruby/Portfile
trunk/dports/lang/ruby186/Portfile
trunk/dports/lang/swi-prolog/Portfile
trunk/dports/lang/swi-prolog-devel/Portfile
trunk/dports/multimedia/MPlayer/Portfile
trunk/dports/multimedia/ffmpeg/Portfile
trunk/dports/multimedia/ffmpeg-devel/Portfile
trunk/dports/net/unbound/Portfile
trunk/dports/security/pwman/Portfile
trunk/dports/x11/wine/Portfile
trunk/dports/x11/wine-crossover/Portfile
trunk/dports/x11/wine-crossover-games/Portfile
trunk/dports/x11/wine-devel/Portfile
Modified: trunk/dports/aqua/HandBrake/Portfile
===================================================================
--- trunk/dports/aqua/HandBrake/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/aqua/HandBrake/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -128,15 +128,13 @@
${worksrcpath}/contrib/ffmpeg/A06-jack-osx.patch
}
-if {${configure.compiler} == "clang" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
- configure.cxx ${prefix}/bin/g++-apple-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
# the Python PortGroup disables configure, we still want to use it, though
Modified: trunk/dports/cross/i386-mingw32-gcc/Portfile
===================================================================
--- trunk/dports/cross/i386-mingw32-gcc/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/cross/i386-mingw32-gcc/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -55,12 +55,13 @@
port:gettext
# segfault when built with llvm on lion: #30349
-if {${configure.compiler} == "clang" || ${configure.compiler} == "llvm-gcc-4.2"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
# Build in a different directory, as advised in the README file.
Modified: trunk/dports/emulators/qemu/Portfile
===================================================================
--- trunk/dports/emulators/qemu/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/emulators/qemu/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -39,13 +39,13 @@
port:ossp-uuid
# target-i386/exec.h:31:30: error: global register variables are not supported
-if {${configure.compiler} == "clang" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
configure.args --cc=${configure.cc} \
Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/lang/ghc/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -356,15 +356,13 @@
}
-if {${configure.compiler} == "clang" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
- configure.cxx ${prefix}/bin/g++-apple-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
Modified: trunk/dports/lang/ruby/Portfile
===================================================================
--- trunk/dports/lang/ruby/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/lang/ruby/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -59,13 +59,13 @@
# #30275: ruby built with clang or llvm-gcc does not work
# see list "MacPorts on Lion (common issues, fixes, and workarounds)"
# http://lists.macosforge.org/pipermail/macports-dev/2011-July/015263.html
-if {${configure.compiler} == "clang" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
configure.args --enable-shared \
Modified: trunk/dports/lang/ruby186/Portfile
===================================================================
--- trunk/dports/lang/ruby186/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/lang/ruby186/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -67,13 +67,13 @@
# #30275: ruby built with clang or llvm-gcc does not work
# see list "MacPorts on Lion (common issues, fixes, and workarounds)"
# http://lists.macosforge.org/pipermail/macports-dev/2011-July/015263.html
-if {${configure.compiler} == "clang" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
configure.args --enable-shared \
Modified: trunk/dports/lang/swi-prolog/Portfile
===================================================================
--- trunk/dports/lang/swi-prolog/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/lang/swi-prolog/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -65,13 +65,13 @@
--x-libraries=${prefix}/lib \
--with-world
-if {${configure.compiler} == "clang" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
build.env \
Modified: trunk/dports/lang/swi-prolog-devel/Portfile
===================================================================
--- trunk/dports/lang/swi-prolog-devel/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/lang/swi-prolog-devel/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -67,13 +67,13 @@
--x-libraries=${prefix}/lib \
--with-world
-if {${configure.compiler} == "clang" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
build.env \
Modified: trunk/dports/multimedia/MPlayer/Portfile
===================================================================
--- trunk/dports/multimedia/MPlayer/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/multimedia/MPlayer/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -67,15 +67,13 @@
# configure is not autoconf
universal_variant no
-if {${configure.compiler} == "clang" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
- configure.cxx ${prefix}/bin/g++-apple-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
configure.args \
Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/multimedia/ffmpeg/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -88,19 +88,13 @@
# fixed in llvm-gcc trunk, but not in Apple's shipped llvm-gccs.
#
# similarly clang fails to build on i386 platforms
-#
-# use code provided by jeremyhu here to use gcc-4.2 instead
-#
-# http://lists.macosforge.org/pipermail/macports-dev/2011-July/015263.html
-#
-
-if {${configure.compiler} == "clang" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -93,19 +93,13 @@
# fixed in llvm-gcc trunk, but not in Apple's shipped llvm-gccs.
#
# similarly clang fails to build on i386 platforms
-#
-# use code provided by jeremyhu here to use gcc-4.2 instead
-#
-# http://lists.macosforge.org/pipermail/macports-dev/2011-July/015263.html
-#
-
-if {${configure.compiler} == "clang" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
Modified: trunk/dports/net/unbound/Portfile
===================================================================
--- trunk/dports/net/unbound/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/net/unbound/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -33,15 +33,13 @@
sha256 c15b85145e3175f3d933837071b4ffaae8da4a394139ac0e7f3dfee11712e7d3
if {[variant_isset universal]} {
- if {${configure.compiler} == "clang" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
+ if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
- configure.cxx ${prefix}/bin/g++-apple-4.2
- }
+ } elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
}
Modified: trunk/dports/security/pwman/Portfile
===================================================================
--- trunk/dports/security/pwman/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/security/pwman/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -28,15 +28,13 @@
configure.args --mandir=${prefix}/share/man
-if {${configure.compiler} == "clang" ||
- ${configure.compiler} == "llvm-gcc-4.2"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
- configure.cxx ${prefix}/bin/g++-apple-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
livecheck.url ${homepage}
Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/x11/wine/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -148,13 +148,13 @@
# BUILD FIX TODO: llvm-gcc-4.2, clang
# llvm-gcc does not respect force_align_arg_pointer
# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
-if {${configure.compiler} == "llvm-gcc-4.2" ||
- ${configure.compiler} == "clang"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
platform darwin 9 {
Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/x11/wine-crossover/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -148,13 +148,13 @@
# BUILD FIX TODO: llvm-gcc-4.2, clang
# llvm-gcc does not respect force_align_arg_pointer
# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
-if {${configure.compiler} == "llvm-gcc-4.2" ||
- ${configure.compiler} == "clang"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
# darwin 8
Modified: trunk/dports/x11/wine-crossover-games/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover-games/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/x11/wine-crossover-games/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -150,13 +150,13 @@
# BUILD FIX TODO: llvm-gcc-4.2, clang
# llvm-gcc does not respect force_align_arg_pointer
# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
-if {${configure.compiler} == "llvm-gcc-4.2" ||
- ${configure.compiler} == "clang"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
# darwin 8
Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile 2012-01-24 18:59:33 UTC (rev 89314)
+++ trunk/dports/x11/wine-devel/Portfile 2012-01-24 22:31:47 UTC (rev 89315)
@@ -147,13 +147,13 @@
# BUILD FIX TODO: llvm-gcc-4.2, clang
# llvm-gcc does not respect force_align_arg_pointer
# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
-if {${configure.compiler} == "llvm-gcc-4.2" ||
- ${configure.compiler} == "clang"} {
+if {${configure.compiler} == "llvm-gcc-4.2"} {
configure.compiler gcc-4.2
- if {![file executable ${configure.cc}]} {
- depends_build-append port:apple-gcc42
- configure.compiler apple-gcc-4.2
- }
+} elseif {${configure.compiler} == "clang"} {
+ depends_build-append port:apple-gcc42
+ configure.compiler apple-gcc-4.2
+ # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
+ configure.cxx ${prefix}/bin/g++-apple-4.2
}
platform darwin 9 {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120124/fd6dcfcf/attachment-0001.html>
More information about the macports-changes
mailing list