[92008] trunk/dports/gnome
jeremyhu at macports.org
jeremyhu at macports.org
Sun Apr 15 16:23:44 PDT 2012
Revision: 92008
https://trac.macports.org/changeset/92008
Author: jeremyhu at macports.org
Date: 2012-04-15 16:23:43 -0700 (Sun, 15 Apr 2012)
Log Message:
-----------
gstreamer, etc: Make the --build --host logic more robust
Modified Paths:
--------------
trunk/dports/gnome/gst-plugins-bad/Portfile
trunk/dports/gnome/gst-plugins-base/Portfile
trunk/dports/gnome/gst-plugins-gl/Portfile
trunk/dports/gnome/gst-plugins-good/Portfile
trunk/dports/gnome/gst-plugins-ugly/Portfile
trunk/dports/gnome/gstreamer/Portfile
trunk/dports/gnome/gtk2/Portfile
Modified: trunk/dports/gnome/gst-plugins-bad/Portfile
===================================================================
--- trunk/dports/gnome/gst-plugins-bad/Portfile 2012-04-15 22:51:32 UTC (rev 92007)
+++ trunk/dports/gnome/gst-plugins-bad/Portfile 2012-04-15 23:23:43 UTC (rev 92008)
@@ -101,8 +101,14 @@
}
if {[variant_isset universal]} {
- set merger_host(x86_64) ${build_arch}-apple-${os.platform}${os.major}
- set merger_configure_args(x86_64) --build=${build_arch}-apple-${os.platform}${os.major}
+ set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
+ set merger_host(i386) i686-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}
+} elseif {${build_arch} == "i386"} {
+ configure.args-append \
+ --host=i686-apple-${os.platform}${os.major} \
+ --build=i686-apple-${os.platform}${os.major}
} elseif {${build_arch} == "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
Modified: trunk/dports/gnome/gst-plugins-base/Portfile
===================================================================
--- trunk/dports/gnome/gst-plugins-base/Portfile 2012-04-15 22:51:32 UTC (rev 92007)
+++ trunk/dports/gnome/gst-plugins-base/Portfile 2012-04-15 23:23:43 UTC (rev 92008)
@@ -85,8 +85,14 @@
}
if {[variant_isset universal]} {
- set merger_host(x86_64) ${build_arch}-apple-${os.platform}${os.major}
- set merger_configure_args(x86_64) --build=${build_arch}-apple-${os.platform}${os.major}
+ set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
+ set merger_host(i386) i686-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}
+} elseif {${build_arch} == "i386"} {
+ configure.args-append \
+ --host=i686-apple-${os.platform}${os.major} \
+ --build=i686-apple-${os.platform}${os.major}
} elseif {${build_arch} == "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
Modified: trunk/dports/gnome/gst-plugins-gl/Portfile
===================================================================
--- trunk/dports/gnome/gst-plugins-gl/Portfile 2012-04-15 22:51:32 UTC (rev 92007)
+++ trunk/dports/gnome/gst-plugins-gl/Portfile 2012-04-15 23:23:43 UTC (rev 92008)
@@ -52,8 +52,14 @@
}
if {[variant_isset universal]} {
- set merger_host(x86_64) ${build_arch}-apple-${os.platform}${os.major}
- set merger_configure_args(x86_64) --build=${build_arch}-apple-${os.platform}${os.major}
+ set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
+ set merger_host(i386) i686-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}
+} elseif {${build_arch} == "i386"} {
+ configure.args-append \
+ --host=i686-apple-${os.platform}${os.major} \
+ --build=i686-apple-${os.platform}${os.major}
} elseif {${build_arch} == "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
Modified: trunk/dports/gnome/gst-plugins-good/Portfile
===================================================================
--- trunk/dports/gnome/gst-plugins-good/Portfile 2012-04-15 22:51:32 UTC (rev 92007)
+++ trunk/dports/gnome/gst-plugins-good/Portfile 2012-04-15 23:23:43 UTC (rev 92008)
@@ -58,8 +58,14 @@
configure.args-append --disable-gtk-doc --disable-schemas-install --with-default-videosink=ximagesink
if {[variant_isset universal]} {
- set merger_host(x86_64) ${build_arch}-apple-${os.platform}${os.major}
- set merger_configure_args(x86_64) --build=${build_arch}-apple-${os.platform}${os.major}
+ set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
+ set merger_host(i386) i686-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}
+} elseif {${build_arch} == "i386"} {
+ configure.args-append \
+ --host=i686-apple-${os.platform}${os.major} \
+ --build=i686-apple-${os.platform}${os.major}
} elseif {${build_arch} == "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
Modified: trunk/dports/gnome/gst-plugins-ugly/Portfile
===================================================================
--- trunk/dports/gnome/gst-plugins-ugly/Portfile 2012-04-15 22:51:32 UTC (rev 92007)
+++ trunk/dports/gnome/gst-plugins-ugly/Portfile 2012-04-15 23:23:43 UTC (rev 92008)
@@ -51,8 +51,14 @@
}
if {[variant_isset universal]} {
- set merger_host(x86_64) ${build_arch}-apple-${os.platform}${os.major}
- set merger_configure_args(x86_64) --build=${build_arch}-apple-${os.platform}${os.major}
+ set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
+ set merger_host(i386) i686-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}
+} elseif {${build_arch} == "i386"} {
+ configure.args-append \
+ --host=i686-apple-${os.platform}${os.major} \
+ --build=i686-apple-${os.platform}${os.major}
} elseif {${build_arch} == "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
Modified: trunk/dports/gnome/gstreamer/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer/Portfile 2012-04-15 22:51:32 UTC (rev 92007)
+++ trunk/dports/gnome/gstreamer/Portfile 2012-04-15 23:23:43 UTC (rev 92008)
@@ -47,8 +47,14 @@
configure.args-append --disable-introspection
if {[variant_isset universal]} {
- set merger_host(x86_64) ${build_arch}-apple-${os.platform}${os.major}
- set merger_configure_args(x86_64) --build=${build_arch}-apple-${os.platform}${os.major}
+ set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
+ set merger_host(i386) i686-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}
+} elseif {${build_arch} == "i386"} {
+ configure.args-append \
+ --host=i686-apple-${os.platform}${os.major} \
+ --build=i686-apple-${os.platform}${os.major}
} elseif {${build_arch} == "x86_64"} {
configure.args-append \
--host=${build_arch}-apple-${os.platform}${os.major} \
Modified: trunk/dports/gnome/gtk2/Portfile
===================================================================
--- trunk/dports/gnome/gtk2/Portfile 2012-04-15 22:51:32 UTC (rev 92007)
+++ trunk/dports/gnome/gtk2/Portfile 2012-04-15 23:23:43 UTC (rev 92008)
@@ -107,6 +107,10 @@
>${prefix}/etc/gtk-2.0/gdk-pixbuf.loaders"
}
+platform darwin 12 {
+ configure.args-append --disable-cups
+}
+
platform darwin 8 {
if {[variant_isset quartz] || [variant_isset no_x11]} {
configure.ldflags-append -framework Cocoa -framework Carbon
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120415/4d1d24f7/attachment.html>
More information about the macports-changes
mailing list