[Pkg-virtualbox-commits] [kbuild] 01/03: New upstream version 0.1.9998svn3127+dfsg
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Thu Nov 23 07:50:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository kbuild.
commit 2d490a56310e36c8b900044a417607d0f1a4303a
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date: Thu Nov 23 08:49:05 2017 +0100
New upstream version 0.1.9998svn3127+dfsg
---
kBuild/env.sh | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/kBuild/env.sh b/kBuild/env.sh
index d4a7583..1d609e1 100755
--- a/kBuild/env.sh
+++ b/kBuild/env.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: env.sh 3111 2017-10-22 11:38:15Z bird $
+# $Id: env.sh 3127 2017-11-22 20:15:12Z bird $
## @file
# Environment setup script.
#
@@ -339,8 +339,20 @@ if test -z "$KBUILD_HOST_ARCH"; then
KBUILD_HOST_ARCH='amd64'
# Try detect debian x32.
if test "$KBUILD_HOST" = "linux"; then
- case "`uname -v`" in
- *Debian*+x32+*) KBUILD_HOST_ARCH=x32 ;;
+ if test -z "${DEB_HOST_ARCH}"; then
+ DEB_HOST_ARCH=`dpkg-architecture -qDEB_HOST_ARCH 2> /dev/null`;
+ if test -z "${DEB_HOST_ARCH}"; then
+ DEB_HOST_ARCH=`dpkg --print-architecture 2> /dev/null`;
+ fi
+ fi
+ case "${DEB_HOST_ARCH}" in
+ "x32")
+ KBUILD_HOST_ARCH=x32
+ ;;
+ "") case "`uname -v`" in
+ *Debian*+x32+*) KBUILD_HOST_ARCH=x32 ;;
+ esac
+ ;;
esac
fi
;;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/kbuild.git
More information about the Pkg-virtualbox-commits
mailing list