Revision: 105560 https://trac.macports.org/changeset/105560 Author: jeremyhu@macports.org Date: 2013-04-24 17:01:24 -0700 (Wed, 24 Apr 2013) Log Message: ----------- gstreamer1-gst*: Set destroot.args as well for consistency and possible build failures with introspection bits Modified Paths: -------------- trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile trunk/dports/gnome/gstreamer1-gst-plugins-base/Portfile trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile trunk/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile Modified: trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile =================================================================== --- trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile 2013-04-24 23:59:22 UTC (rev 105559) +++ trunk/dports/gnome/gstreamer1-gst-plugins-bad/Portfile 2013-04-25 00:01:24 UTC (rev 105560) @@ -116,19 +116,22 @@ # 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}' } -} elseif {${build_arch} == "i386"} { - configure.args-append \ - --host=i686-apple-${os.platform}${os.major} \ - --build=i686-apple-${os.platform}${os.major} - build.args-append CC="${configure.cc} ${configure.cc_archflags}" -} elseif {${build_arch} == "x86_64"} { - configure.args-append \ - --host=${build_arch}-apple-${os.platform}${os.major} \ - --build=${build_arch}-apple-${os.platform}${os.major} - build.args-append CC="${configure.cc} ${configure.cc_archflags}" } else { + + if {${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} \ + --build=${build_arch}-apple-${os.platform}${os.major} + } + build.args-append CC="${configure.cc} ${configure.cc_archflags}" + destroot.args-append CC="${configure.cc} ${configure.cc_archflags}" } livecheck.type regex Modified: trunk/dports/gnome/gstreamer1-gst-plugins-base/Portfile =================================================================== --- trunk/dports/gnome/gstreamer1-gst-plugins-base/Portfile 2013-04-24 23:59:22 UTC (rev 105559) +++ trunk/dports/gnome/gstreamer1-gst-plugins-base/Portfile 2013-04-25 00:01:24 UTC (rev 105560) @@ -96,19 +96,22 @@ # 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}' } -} elseif {${build_arch} == "i386"} { - configure.args-append \ - --host=i686-apple-${os.platform}${os.major} \ - --build=i686-apple-${os.platform}${os.major} - build.args-append CC="${configure.cc} ${configure.cc_archflags}" -} elseif {${build_arch} == "x86_64"} { - configure.args-append \ - --host=${build_arch}-apple-${os.platform}${os.major} \ - --build=${build_arch}-apple-${os.platform}${os.major} - build.args-append CC="${configure.cc} ${configure.cc_archflags}" } else { + + if {${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} \ + --build=${build_arch}-apple-${os.platform}${os.major} + } + build.args-append CC="${configure.cc} ${configure.cc_archflags}" + destroot.args-append CC="${configure.cc} ${configure.cc_archflags}" } livecheck.type regex Modified: trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile =================================================================== --- trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile 2013-04-24 23:59:22 UTC (rev 105559) +++ trunk/dports/gnome/gstreamer1-gst-plugins-good/Portfile 2013-04-25 00:01:24 UTC (rev 105560) @@ -72,19 +72,22 @@ # 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}' } -} elseif {${build_arch} == "i386"} { - configure.args-append \ - --host=i686-apple-${os.platform}${os.major} \ - --build=i686-apple-${os.platform}${os.major} - build.args-append CC="${configure.cc} ${configure.cc_archflags}" -} elseif {${build_arch} == "x86_64"} { - configure.args-append \ - --host=${build_arch}-apple-${os.platform}${os.major} \ - --build=${build_arch}-apple-${os.platform}${os.major} - build.args-append CC="${configure.cc} ${configure.cc_archflags}" } else { + + if {${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} \ + --build=${build_arch}-apple-${os.platform}${os.major} + } + build.args-append CC="${configure.cc} ${configure.cc_archflags}" + destroot.args-append CC="${configure.cc} ${configure.cc_archflags}" } # SSE register return with SSE disabled Modified: trunk/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile =================================================================== --- trunk/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile 2013-04-24 23:59:22 UTC (rev 105559) +++ trunk/dports/gnome/gstreamer1-gst-plugins-ugly/Portfile 2013-04-25 00:01:24 UTC (rev 105560) @@ -65,19 +65,22 @@ # 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}' } -} elseif {${build_arch} == "i386"} { - configure.args-append \ - --host=i686-apple-${os.platform}${os.major} \ - --build=i686-apple-${os.platform}${os.major} - build.args-append CC="${configure.cc} ${configure.cc_archflags}" -} elseif {${build_arch} == "x86_64"} { - configure.args-append \ - --host=${build_arch}-apple-${os.platform}${os.major} \ - --build=${build_arch}-apple-${os.platform}${os.major} - build.args-append CC="${configure.cc} ${configure.cc_archflags}" } else { + + if {${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} \ + --build=${build_arch}-apple-${os.platform}${os.major} + } + build.args-append CC="${configure.cc} ${configure.cc_archflags}" + destroot.args-append CC="${configure.cc} ${configure.cc_archflags}" } livecheck.type regex