Merge lp:~vorlon/xdeb/multiarch-foreign-builddeps into lp:xdeb

[Steve Langasek]

Some preliminary multiarchification of xdeb: if a build-dependency is
Multi-Arch: foreign, we don't have to cross-build it just for sake of using
it as a build-dep, since we can install it in the build environment just
fine.

[lp:~vorlon/xdeb/multiarch-foreign-builddeps]

246. By Steve Langasek on 2011-02-22

catch up with trunk

[Loïc Minier (lool)]

Looks good; did some minor adjustment to comments to honor some PEPs I was told to honor in linaro-image-tools ;-) also added some space between args in function calls

Thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-31 23:22:04 +0000
+++ debian/changelog	2011-02-22 06:33:11 +0000
@@ -1,5 +1,7 @@
-xdeb (0.6.3ubuntu1) UNRELEASED; urgency=low
+xdeb (0.6.4) UNRELEASED; urgency=low
 
+  * If a package is Multi-Arch: foreign, we don't need to build it unless we
+    also want to install it in its own right.
   * add tcl8.5 to the whitelist alongside tcl8.4.
 
  -- Steve Langasek <[e-mail]>  Mon, 31 Jan 2011 15:21:34 -0800

=== modified file 'xdeb.py'
--- xdeb.py	2010-10-15 22:51:03 +0000
+++ xdeb.py	2011-02-22 06:33:11 +0000
@@ -97,6 +97,23 @@
         return tree.get_src_binaries(options, src)
 
 
+def is_multiarch_foreign(options, pkg):
+    """Check if Multi-Arch: foreign is set on the binary package pkg 
+    (doesn't need build if it's just a build-dep)"""
+
+    real_pkg = get_real_pkg(options,pkg)
+    if real_pkg is None:
+        return False
+    record = get_pkg_record(options,real_pkg)
+    if record is None:
+       return False
+
+    if 'multi-arch' in record:
+        return record['multi-arch'] == 'foreign'
+    else:
+        return False
+
+
 def is_toolchain(pkg):
     """Is this tool incapable of cross-building pkg?"""
     return ('libc6' in pkg or 'lib32gcc' in pkg or 'lib64gcc' in pkg or
@@ -171,12 +188,13 @@
             new_deps.append(new_or_deps)
     return new_deps
 
-def should_expand(parent, pkg):
+def should_expand(options, parent, pkg):
     if pkg in explicit_requests:
         # We're going to build it anyway because it was requested on the
         # command line, so we might as well sequence it properly.
         return True
     return (is_crossable(pkg) and not is_toolchain(pkg) and
+            not is_multiarch_foreign(options, pkg) and
             not need_loop_break(parent, pkg))
 
 def expand_depends(options, pkg, depth, builddep_depth,
@@ -239,7 +257,7 @@
                 # break this cycle
                 continue
             bd_pkg = builddep[0]['name']
-            if should_expand(src, bd_pkg):
+            if should_expand(options, src, bd_pkg):
                 expand_depends(options, bd_pkg, depth + 1, builddep_depth + 1,
                                parent=src)
 
@@ -255,13 +273,13 @@
                 # Check should_expand twice, once for the virtual package
                 # name and once for the real package name (which may be
                 # different).
-                if not should_expand(src, or_dep['name']):
+                if not should_expand(options, src, or_dep['name']):
                     continue
                 # TODO version handling?
                 real_dep = get_real_pkg(options, or_dep['name'])
                 if (real_dep is not None and
                     get_src_name(options, real_dep) is not None):
-                    if should_expand(src, real_dep):
+                    if should_expand(options, src, real_dep):
                         expand_depends(options, real_dep, depth + 1,
                                        builddep_depth,
                                        parent=src, parent_binary=binary)