From 7d04e923bc874bb602f69bd7c6947ed610d18fee Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 17 Oct 2013 17:31:15 +0200 Subject: check for dpkg-architecture on Debian and Ubuntu hosts, otherwise python2 host zlib module isn't build --- scripts/scan-pkgs.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 7fa68822a..e611f4269 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -19,10 +19,17 @@ test -z "$BASH_VERSION$KSH_VERSION" && exec $BASH $0 "$@" [[ -n $BASH_VERSION ]] && shopt -s extglob topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P)) OStype=$(uname) +isdeb=$(uname -a|grep '\(Debian\|Ubuntu\)') out=0 . $topdir/.config +if [ $isdeb -eq 0 ];then + if [[ -n $ADK_COMPILE_PYTHON2 ]]; then + NEED_DPKG_ARCHITECTURE="$NEED_DPKG_ARCHITECTURE python2" + fi +fi + if [[ -n $ADK_NATIVE ]];then if [[ -n $ADK_PACKAGE_NEON ]];then NEED_LIBXML2_DEV="$NEED_LIBXML2_DEV neon" @@ -490,6 +497,13 @@ if [[ -n $NEED_MAKEDEPEND ]]; then fi fi +if [[ -n $NEED_DPKG_ARCHITECTURE ]]; then + if ! which dpkg-architecture >/dev/null 2>&1; then + echo >&2 You need dpkg-architecture to build $NEED_DPKG_ARCHITECTURE + out=1 + fi +fi + if [[ -n $ADK_USE_CCACHE ]]; then if ! which ccache >/dev/null 2>&1; then echo >&2 You have selected to build with ccache, but ccache could not be found. -- cgit v1.2.3