[108911] trunk/dports/gnome
jeremyhu at macports.org
jeremyhu at macports.org
Sun Aug 4 11:33:17 PDT 2013
Revision: 108911
https://trac.macports.org/changeset/108911
Author: jeremyhu at macports.org
Date: 2013-08-04 11:33:17 -0700 (Sun, 04 Aug 2013)
Log Message:
-----------
gstreamer*-gst-{ffmpeg,libav}: Use the same compiler blacklisting as the ffmpeg port
Modified Paths:
--------------
trunk/dports/gnome/gstreamer010-gst-ffmpeg/Portfile
trunk/dports/gnome/gstreamer1-gst-libav/Portfile
Modified: trunk/dports/gnome/gstreamer010-gst-ffmpeg/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer010-gst-ffmpeg/Portfile 2013-08-04 18:08:03 UTC (rev 108910)
+++ trunk/dports/gnome/gstreamer010-gst-ffmpeg/Portfile 2013-08-04 18:33:17 UTC (rev 108911)
@@ -6,6 +6,8 @@
# https://bugzilla.gnome.org/show_bug.cgi?id=636134
PortGroup muniversal 1.0
+PortGroup compiler_blacklist_versions 1.0
+
name gstreamer010-gst-ffmpeg
set my_name gst-ffmpeg
version 0.10.13
@@ -40,43 +42,25 @@
# This will cause the installed ffmpeg headers to be used, remove it.
configure.cppflags-delete -I${prefix}/include
+if {[lsearch [get_canonical_archs] i386] != -1} {
+ # clang-3.1 hits https://trac.macports.org/ticket/30137 (<rdar://problem/11542429>)
+ # clang-139 hits https://trac.macports.org/ticket/38141
+ compiler.blacklist-append {clang < 422.1.7} macports-clang-3.1
+
+ # https://trac.macports.org/ticket/37802
+ compiler.blacklist-append llvm-gcc-4.2 macports-llvm-gcc-4.2
+}
+
if {[variant_isset universal]} {
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
set merger_host(i386) i686-apple-${os.platform}${os.major}
set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major}
set merger_host(ppc) powerpc-apple-${os.platform}${os.major}
set merger_configure_args(x86_64) "--build=x86_64-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=x86_64\""
+ set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=i686\""
set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=ppc\""
set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=ppc64\""
-
- if {[string match "*gcc-4.2" ${configure.compiler}] && [lsearch ${universal_archs} i386] != -1} {
- if {[vercmp ${xcodeversion} 3.2] >= 0} {
- set merger_configure_compiler(i386) clang
- set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=[portconfigure::find_developer_tool clang] --arch=i686\""
- } else {
- # i386 in +universal needs MacPorts base 2.1 on Leopard
- depends_build port:clang-3.0
- depends_skip_archcheck-append clang-3.0
-
- set merger_configure_compiler(i386) macports-clang-3.0
-
- set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${prefix}/bin/clang-mp-3.0 --arch=i686\""
- }
- } else {
- set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major} --with-ffmpeg-extra-configure=\"--cc=${configure.cc} --arch=i686\""
- }
} elseif {${build_arch} == "i386"} {
- if {${configure.compiler} == "gcc-4.2"} {
- if {[vercmp ${xcodeversion} 3.2] >= 0} {
- configure.compiler clang
- } else {
- depends_build port:clang-3.0
- depends_skip_archcheck-append clang-3.0
-
- # FIXME: Use macports-clang-3.0 once 2.1 is out
- configure.cc ${prefix}/bin/clang-mp-3.0
- }
- }
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major} \
Modified: trunk/dports/gnome/gstreamer1-gst-libav/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1-gst-libav/Portfile 2013-08-04 18:08:03 UTC (rev 108910)
+++ trunk/dports/gnome/gstreamer1-gst-libav/Portfile 2013-08-04 18:33:17 UTC (rev 108911)
@@ -6,6 +6,8 @@
# https://bugzilla.gnome.org/show_bug.cgi?id=636134
PortGroup muniversal 1.0
+PortGroup compiler_blacklist_versions 1.0
+
name gstreamer1-gst-libav
set my_name gst-libav
version 1.0.9
@@ -40,43 +42,25 @@
# This will cause the installed ffmpeg headers to be used, remove it.
configure.cppflags-delete -I${prefix}/include
+if {[lsearch [get_canonical_archs] i386] != -1} {
+ # clang-3.1 hits https://trac.macports.org/ticket/30137 (<rdar://problem/11542429>)
+ # clang-139 hits https://trac.macports.org/ticket/38141
+ compiler.blacklist-append {clang < 422.1.7} macports-clang-3.1
+
+ # https://trac.macports.org/ticket/37802
+ compiler.blacklist-append llvm-gcc-4.2 macports-llvm-gcc-4.2
+}
+
if {[variant_isset universal]} {
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
set merger_host(i386) i686-apple-${os.platform}${os.major}
set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major}
set merger_host(ppc) powerpc-apple-${os.platform}${os.major}
set merger_configure_args(x86_64) "--build=x86_64-apple-${os.platform}${os.major}"
+ set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major}"
set merger_configure_args(ppc) "--build=powerpc-apple-${os.platform}${os.major}"
set merger_configure_args(ppc64) "--build=powerpc64-apple-${os.platform}${os.major}"
-
- if {[string match "*gcc-4.2" ${configure.compiler}] && [lsearch ${universal_archs} i386] != -1} {
- if {[vercmp ${xcodeversion} 3.2] >= 0} {
- set merger_configure_compiler(i386) clang
- set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major}"
- } else {
- # i386 in +universal needs MacPorts base 2.1 on Leopard
- depends_build port:clang-3.0
- depends_skip_archcheck-append clang-3.0
-
- set merger_configure_compiler(i386) macports-clang-3.0
-
- set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major}"
- }
- } else {
- set merger_configure_args(i386) "--build=i686-apple-${os.platform}${os.major}"
- }
} elseif {${build_arch} == "i386"} {
- if {${configure.compiler} == "gcc-4.2"} {
- if {[vercmp ${xcodeversion} 3.2] >= 0} {
- configure.compiler clang
- } else {
- depends_build port:clang-3.0
- depends_skip_archcheck-append clang-3.0
-
- # FIXME: Use macports-clang-3.0 once 2.1 is out
- configure.cc ${prefix}/bin/clang-mp-3.0
- }
- }
configure.args-append \
--host=i686-apple-${os.platform}${os.major} \
--build=i686-apple-${os.platform}${os.major}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130804/b25d70b6/attachment.html>
More information about the macports-changes
mailing list