Description: Use dpkg-architecture to guess the build OS and architecture
 This is to avoid misbuilding on e.g. chroots.
Origin: vendor
Forwarded: not-needed
Author: Alessandro Ghedini <ghedo@debian.org>
Reviewed-by: Alessandro Ghedini <ghedo@debian.org>
Last-Update: 2012-04-23

--- a/3rdparty/dyncall/configure
+++ b/3rdparty/dyncall/configure
@@ -100,7 +100,7 @@
 CONFIG_OS=""
 guess_os()
 {
-  OS=`uname -s`
+  OS=`dpkg-architecture -qDEB_BUILD_ARCH_OS`
   if [ "$OS" = "WindowsNT" ]; then
     CONFIG_OS="windows"
   elif [ "$OS" = "Darwin" ]; then
@@ -116,13 +116,13 @@
        [ "$OS" = "MINGW32_NT-5.1" ] ||
        [ "$OS" = "MINGW32_NT-5.2" ]; then
     CONFIG_OS="msys"
-  elif [ "$OS" = "Linux" ]; then
+  elif [ "$OS" = "Linux" ] || [ "$OS" = "linux" ]; then
     CONFIG_OS="linux"
   elif [ "$OS" = "SunOS" ]; then
     CONFIG_OS="sunos"
   elif [ "$OS" = "OpenBSD" ]; then
     CONFIG_OS="openbsd"
-  elif [ "$OS" = "FreeBSD" ]; then
+  elif [ "$OS" = "FreeBSD" ] || [ "$OS" = "kfreebsd" ]; then
     CONFIG_OS="freebsd"
   elif [ "$OS" = "NetBSD" ]; then
     CONFIG_OS="netbsd"
@@ -179,7 +179,7 @@
       CONFIG_ARCH="ppc32"
     fi
   else
-    ARCH=`uname -m`
+    ARCH=`dpkg-architecture -qDEB_BUILD_ARCH_CPU`
     if [ "$ARCH" = "Power Macintosh" ] || [ "$ARCH" = "ppc" ] || [ "$ARCH" = "macppc" ] || [ "$ARCH" = "powerpc" ]; then
       CONFIG_ARCH="ppc32"
     elif [ "$ARCH" = "ppc64" ]; then
@@ -188,7 +188,7 @@
       CONFIG_ARCH="x86"
     elif [ "$ARCH" = "amd64" ] || [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "x64" ]; then
       CONFIG_ARCH="x64"
-    elif [ "$ARCH" = "acorn32" ] || [ "$ARCH" = "cats" ] || [ "$ARCH" = "shark" ] || [ "$ARCH" = "armv7l" ] || [ "$ARCH" = "armv5tejl" ]; then
+    elif [ "$ARCH" = "arm" ] || [ "$ARCH" = "acorn32" ] || [ "$ARCH" = "cats" ] || [ "$ARCH" = "shark" ] || [ "$ARCH" = "armv7l" ] || [ "$ARCH" = "armv5tejl" ]; then
       CONFIG_ARCH="arm32_arm"
     elif [ "$ARCH" = "BePC" ]; then
       CONFIG_ARCH="x86"
@@ -198,7 +198,7 @@
       CONFIG_ARCH="mips32el"
     elif [ "$ARCH" = "loongson" ]; then
       CONFIG_ARCH="mips64el"
-    elif [ "$ARCH" = "sparc64" ]; then
+    elif [ "$ARCH" = "sparc" ] || [ "$ARCH" = "sparc64" ]; then
       CONFIG_ARCH="sparc"
     elif [ "$ARCH" = "ia64" ]; then
       CONFIG_ARCH="ia64"