The following commit has been merged in the master branch:
commit 87f2624cf5e064ded10775bb04a0b7b95adbf5bb
Author: Steve Langasek <[email protected]>
Date: Sat Nov 5 11:15:26 2011 -0700
Always make mk-build-deps packages arch-dependent when --arch is passed
When an --arch argument is passed to mk-build-deps, we should output an
architecture-dependent package even if there are no architecture-dependent
build-dependencies, so that cross-installing the package in a multiarch
environment does the right thing.
Signed-off-by: James McCoy <[email protected]>
diff --git a/scripts/mk-build-deps.pl b/scripts/mk-build-deps.pl
index 61ebd3e..678ea47 100755
--- a/scripts/mk-build-deps.pl
+++ b/scripts/mk-build-deps.pl
@@ -321,9 +321,10 @@ sub build_equiv
if ($opts->{depends} =~ /\[|\]/) {
$arch = 'any';
- if (defined $opt_arch) {
- $args = "--arch=$opt_arch ";
- }
+ }
+ if (defined $opt_arch) {
+ $args = "--arch=$opt_arch ";
+ $arch = $opt_arch;
}
open EQUIVS, "| equivs-build $args-"
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
