On Monday 06 October 2008 08:15:09 pm Roger Leigh wrote: > On Mon, Oct 06, 2008 at 04:40:40PM -0400, Andres Mejia wrote: > > Whoops! Forgot about cases where we might be cross-compiling. Here's a > > corrected patch. We just add the '-a' option from 'dpkg-architecture'. > > Thanks, I'll apply it to the git repository. A new upload will be made > to unstable as soon as Lenny is released, but I'll make an upload to > experimental before then. > > > Regards, > Roger
Here's an updated patch for the new version of sbuild. -- Regards, Andres
--- lib/Sbuild/Build.pm.old 2009-03-09 08:57:09.000000000 -0400
+++ lib/Sbuild/Build.pm 2009-03-09 08:56:59.000000000 -0400
@@ -1848,11 +1848,16 @@
my @archs = split( /\s+/, $archlist );
my ($use_it, $ignore_it, $include) = (0, 0, 0);
foreach (@archs) {
+ # Let's use 'dpkg-architecture' so we can support architecture
+ # wildcards.
+ my $dpkg_architecture = '/usr/bin/dpkg-architecture';
if (/^!/) {
- $ignore_it = 1 if substr($_, 1) eq $self->get('Arch');
+ $ignore_it = 1 if system($dpkg_architecture, '-a' .
+ $self->get('Arch'), '-i' . substr($_, 1)) eq 0;
}
else {
- $use_it = 1 if $_ eq $self->get('Arch');
+ $use_it = 1 if system($dpkg_architecture, '-a' .
+ $self->get('Arch'), '-i' . $_) eq 0;
$include = 1;
}
}
signature.asc
Description: This is a digitally signed message part.
