[114998] trunk/dports/gnome/gstreamer010/Portfile
ryandesign at macports.org
ryandesign at macports.org
Fri Dec 20 22:26:59 PST 2013
Revision: 114998
https://trac.macports.org/changeset/114998
Author: ryandesign at macports.org
Date: 2013-12-20 22:26:58 -0800 (Fri, 20 Dec 2013)
Log Message:
-----------
gstreamer010: fix universal variant by bringing back some changes from gstreamer1 (#41865)
Modified Paths:
--------------
trunk/dports/gnome/gstreamer010/Portfile
Modified: trunk/dports/gnome/gstreamer010/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer010/Portfile 2013-12-21 05:46:31 UTC (rev 114997)
+++ trunk/dports/gnome/gstreamer010/Portfile 2013-12-21 06:26:58 UTC (rev 114998)
@@ -49,26 +49,35 @@
conflicts_build check
-build.env-append CC=${configure.cc}
configure.env-append PERL_PATH=${prefix}/bin/perl
configure.cflags-append -funroll-loops -fstrict-aliasing -fno-common
-if {[variant_isset universal]} {
+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_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
- # g-ir-scanner does not honor CFLAGS
- configure.args-append --disable-introspection
-} elseif {${build_arch} eq "i386"} {
- configure.args-append \
- --host=i686-apple-${os.platform}${os.major} \
- --build=i686-apple-${os.platform}${os.major}
-} elseif {${build_arch} eq "x86_64"} {
- configure.args-append \
- --host=${build_arch}-apple-${os.platform}${os.major} \
- --build=${build_arch}-apple-${os.platform}${os.major}
+ # gobject-introspection uses g-ir-scanner, which uses $CC from env
+ foreach arch ${configure.universal_archs} {
+ lappend merger_build_args(${arch}) CC='${configure.cc} -arch ${arch}'
+ lappend merger_destroot_args(${arch}) CC='${configure.cc} -arch ${arch}'
+ }
+} else {
+
+ if {${build_arch} eq "i386"} {
+ configure.args-append \
+ --host=i686-apple-${os.platform}${os.major} \
+ --build=i686-apple-${os.platform}${os.major}
+ } elseif {${build_arch} eq "x86_64"} {
+ configure.args-append \
+ --host=${build_arch}-apple-${os.platform}${os.major} \
+ --build=${build_arch}-apple-${os.platform}${os.major}
+ }
+
+ # gobject-introspection uses g-ir-scanner, which uses $CC from env
+ build.args-append CC="${configure.cc} ${configure.cc_archflags}"
+ destroot.args-append CC="${configure.cc} ${configure.cc_archflags}"
}
# The rules enabled by gobject-introspection require GNU make 3.81+
@@ -77,8 +86,4 @@
build.cmd ${prefix}/bin/gmake
}
-# gobject-introspection uses g-ir-scanner, which uses $CC from env
-build.args-append CC="${configure.cc} ${configure.cc_archflags}"
-destroot.args-append CC="${configure.cc} ${configure.cc_archflags}"
-
livecheck.type none
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131220/97826fef/attachment.html>
More information about the macports-changes
mailing list