On Sat, Jul 03, 2010 at 06:11:11PM +0100, Roger Leigh wrote: > If not, is Andres patch sufficient to add support at this time? > This is available in #501230 or directly from sbuild.git, > commit c6127d36 (attached). Now attached. -- .''`. Roger Leigh : :' : Debian GNU/Linux http://people.debian.org/~rleigh/ `. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/ `- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
From c6127d360f2f5aba6601cb01799e4f16da528d56 Mon Sep 17 00:00:00 2001
From: Andres Mejia <mcitadel@gmail.com>
Date: Sat, 25 Jul 2009 17:34:05 +0100
Subject: [PATCH] WannaBuild::Database: Add support for architecture wildcards
Signed-off-by: Roger Leigh <rleigh@debian.org>
---
lib/WannaBuild/Database.pm | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/WannaBuild/Database.pm b/lib/WannaBuild/Database.pm
index ccf5e3a..69ceb8a 100644
--- a/lib/WannaBuild/Database.pm
+++ b/lib/WannaBuild/Database.pm
@@ -2103,10 +2103,14 @@ sub parse_srcdeplist {
my @archs = split( /\s+/, $archlist );
my ($use_it, $ignore_it, $include) = (0, 0, 0);
foreach (@archs) {
+ # Use 'dpkg-architecture' to support architecture
+ # wildcards.
if (/^!/) {
- $ignore_it = 1 if substr($_, 1) eq $arch;
+ $ignore_it = 1 if system($Sbuild::Sysconfig::programs{'DPKG_ARCHITECTURE'},
+ '-a' . $arch, '-i' . substr($_, 1)) eq 0;
} else {
- $use_it = 1 if $_ eq $arch;
+ $use_it = 1 if system($Sbuild::Sysconfig::programs{'DPKG_ARCHITECTURE'},
+ '-a' . $arch, '-i' . $_) eq 0;
$include = 1;
}
}
--
1.7.1
Attachment:
signature.asc
Description: Digital signature