[pbuilder] 01/02: fixup! buildpackage-funcs: also use the 'cross' build profile while cross building

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch cross
in repository pbuilder.

commit ee342f265fb2171b59bf15073fbe91c3d1a8751c
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Oct 9 12:42:06 2016 +0000

    fixup! buildpackage-funcs: also use the 'cross' build profile while cross building
---
 pbuilder-buildpackage-funcs | 9 +++++----
 pbuilder.8                  | 4 ++--
 pbuilderrc.5                | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index ca92465..cd81fc1 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -66,6 +66,7 @@ function checkbuilddep () {
     esac
     if \
         ("$PBUILDERSATISFYDEPENDSCMD" \
+            --build-arch "$ARCHITECTURE" \
             --host-arch "$HOST_ARCH" \
             --control "$control" \
             --chroot "${BUILDPLACE}" \
@@ -217,11 +218,11 @@ cross_build_setup () {
     if [ "${NO_AUTO_CROSS:-}" != "really-dont-mess-with-me" ]; then
         log.i "Setting up the environment for a cross build..."
         $CHROOTEXEC dpkg --add-architecture "$HOST_ARCH"
-        EXTRAPACKAGES="${EXTRAPACKAGES:+"$EXTRAPACKAGES"} crossbuild-essential-$HOST_ARCH libc-dev:$HOST_ARCH" # libstdc++-dev:$HOST_ARCH"
-        DEBBUILDOPTS="${DEBBUILDOPTS:+"$DEBBUILDOPTS"} --host-arch $HOST_ARCH"
+        EXTRAPACKAGES="${EXTRAPACKAGES:+"$EXTRAPACKAGES" }crossbuild-essential-$HOST_ARCH libc-dev:$HOST_ARCH" # libstdc++-dev:$HOST_ARCH"
+        DEBBUILDOPTS="${DEBBUILDOPTS:+"$DEBBUILDOPTS" }--host-arch $HOST_ARCH"
         if [ "${NO_AUTO_CROSS:-}" != "yes" ]; then
-            export DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS:+"$DEB_BUILD_OPTIONS"} nocheck"
-            export DEB_BUILD_PROFILES="${DEB_BUILD_PROFILES:+"$DEB_BUILD_PROFILES"} nocheck cross"
+            export DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS:+"$DEB_BUILD_OPTIONS" }nocheck"
+            export DEB_BUILD_PROFILES="${DEB_BUILD_PROFILES:+"$DEB_BUILD_PROFILES" }nocheck cross"
         fi
     else
         log.w "Doing a cross build, but not setting up the environment as instructed"
diff --git a/pbuilder.8 b/pbuilder.8
index ed1f1c9..d16c101 100644
--- a/pbuilder.8
+++ b/pbuilder.8
@@ -221,7 +221,7 @@ or
 .TP
 .BI "\-\-architecture [" "architecture" "]"
 Specifies the
-.B build rchitecture
+.B build architecture
 (as described in
 .BR dpkg\-architecture (1)).
 It'll be the architecture used when creating the chroot, defaults to the
@@ -244,7 +244,7 @@ and
 
 .TP
 .B \-\-no\-auto\-cross
-Supress automatic addition of
+Suppress automatic addition of
 .I nocheck
 to
 .B DEB_BUILD_OPTIONS
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 7ce7ef4..680f233 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -44,7 +44,7 @@ Setting this variable overrides other options.
 .TP
 .BI "ARCHITECTURE=" "`dpkg \-\-print\-architecture`"
 Specifies the
-.B build rchitecture
+.B build architecture
 (as described in
 .BR dpkg\-architecture (1)).
 It'll be the architecture used when creating the chroot, defaults to the

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/pbuilder.git