[gentoo-commits] gentoo-x86 commit in media-libs/libvpx/files: libvpx-1.1.0-chost.patch

[gentoo-commits] gentoo-x86 commit in media-libs/libvpx/files: libvpx-1.1.0-chost.patch

[Alexis Ballier (aballier)]

aballier    12/05/15 12:21:22

  Added:                libvpx-1.1.0-chost.patch
  Log:
  backport patch merged upstream to fix build on multilib portage and cross-compilation
  
  (Portage version: 2.2.0_alpha105/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-libs/libvpx/files/libvpx-1.1.0-chost.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libvpx/files/libvpx-1.1.0-chost.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libvpx/files/libvpx-1.1.0-chost.patch?rev=1.1&content-type=text/plain

Index: libvpx-1.1.0-chost.patch
===================================================================
commit 871bd23e4c41bb0fb94b72832b270766de540dea
Author: Alexis Ballier <alexis.ballier@gmail.com>
Date:   Sat May 12 15:45:13 2012 -0400

    Allow target autodetection to work when cross-compiling.
    
    Allow CHOST to override the gcc -dumpmachine output. This allows to
    use the target autodetection code when cross compiling by setting the
    CHOST variable.
    
    On Gentoo, we would like to support easy cross-compilation, and for
    libvpx this would basically mean copying the code in
    build/make/configure.sh to setup the right --target option. It seems a
    lot easier to let it guess by itself.
    
    Another option I considered was using CROSS-gcc instead but this would
    not work for our multilib setups: They use gcc -m32 to build 32bits
    binaries and gcc -m32 -dumpmachine will output the 64bits version,
    which would then make libvpx wrongly believe it is building for a
    64bits architecture.
    
    Change-Id: I05a19be402228f749e23be7473ca53ae74fd2186

diff --git a/build/make/configure.sh b/build/make/configure.sh
index 3c772e5..3118c0a 100755
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -549,7 +549,7 @@ setup_gnu_toolchain() {
 
 process_common_toolchain() {
     if [ -z "$toolchain" ]; then
-        gcctarget="$(gcc -dumpmachine 2> /dev/null)"
+        gcctarget="${CHOST:-$(gcc -dumpmachine 2> /dev/null)}"
 
         # detect tgt_isa
         case "$gcctarget" in