In dpkg-buildpackage, call debian/rules -qn build-arch, and if it's

available, modify -B handling appropriately.  If build-arch is not
available, then when -B was called, do *not* pass -B on to
dpkg-checkbuilddeps.

diff --git a/ChangeLog b/ChangeLog
index 875f2f400b66f97d6f34faea59dbc325f09a105a..43cb914fa31fd697f2b9c12efbb61d01214fd42a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Sep 15 18:48:39 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * scripts/dpkg-buildpackage.sh: Call debian/rules -qn build-arch, and if
+    it's available, modify -B handling appropriately.  If build-arch is not
+    available, then when -B was called, do *not* pass -B on to
+    dpkg-checkbuilddeps.
+
 Sun Sep 14 21:45:44 CDT 2003 Adam Heath <doogie@debian.org>
 
   * configure.in: Fix broken os_type detection on linux.

diff --git a/debian/changelog b/debian/changelog
index b1de1649dc28928003af01ac0adafc8cc2ca532a..7e86f55c3b33a88c740f75360552fc5c498f6ac3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,10 @@ dpkg (1.10.11) unstable; urgency=low
       * Branden Robinson <branden@debian.org>:
         Report the original casing of field names when they are unknown.
         Closes: #177753
+  * Patch dpkg-buildpackage to call debian/rules -qn build-arch, and if
+    it's available, modify -B handling appropriately.  If build-arch is not
+    available, then when -B was called, do *not* pass -B on to
+    dpkg-checkbuilddeps.  Closes: #203097
   * Frank Lichtenheld <frank@lichtenheld.de>:
     Apply patch, to handle missing infodir.bak, and empty files.  Closes:
     #196361

diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh
index a85dffa36e224434fd003fdbc7094e65a13cca8b..a6302a0d5b8f03c18b0b66eb9f938129ae67dbf8 100755 (executable)
--- a/scripts/dpkg-buildpackage.sh
+++ b/scripts/dpkg-buildpackage.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-version="1.3.0"; # This line modified by Makefile
+version="1.10.10"; # This line modified by Makefile
 
 progname="`basename \"$0\"`"
 usageversion () {
@@ -60,6 +60,7 @@ signchanges='withecho signfile'
 cleansource=false
 checkbuilddep=true
 checkbuilddep_args=''
+buildtarget=build
 binarytarget=binary
 sourcestyle=''
 version=''
@@ -70,6 +71,7 @@ noclean=false
 usepause=false
 warnable_error=0
 passopts=''
+debian/rules -qn build-arch 2>/dev/null && buildarchavailable=true || buildarchavailable=false
 
 while [ $# != 0 ]
 do
@@ -97,7 +99,7 @@ do
        -nc)    noclean=true; if [ -z "$binaryonly" ]; then binaryonly=-b; fi ;;
        -b)     binaryonly=-b; [ "$sourceonly" ] && \
                        { echo >&2 "$progname: cannot combine $1 and -S" ; exit 2 ; } ;;
-       -B)     binaryonly=-B; checkbuilddep_args=-B; binarytarget=binary-arch; [ "$sourceonly" ] && \
+       -B)     binaryonly=-B; binarytarget=binary-arch; if $buildarchavailable; then checkbuilddep_args=-B; fi; [ "$sourceonly" ] && \
                        { echo >&2 "$progname: cannot combine $1 and -S" ; exit 2 ; } ;;
        -S)     sourceonly=-S; checkbuilddep=false; [ "$binaryonly" ] && \
                        { echo >&2 "$progname: cannot combine $binaryonly and $1" ; exit 2 ; } ;;
@@ -196,7 +198,7 @@ if [ x$binaryonly = x ]; then
        cd ..; withecho dpkg-source $passopts $diffignore $tarignore -b "$dirn"; cd "$dirn"
 fi
 if [ x$sourceonly = x ]; then
-       withecho debian/rules build 
+       withecho debian/rules $buildtarget 
        withecho $rootcommand debian/rules $binarytarget
 fi
 if [ "$usepause" = "true" ] && \