Bug#773265: fails to build stage1 cross compiler for i386

[Helmut Grohne <helmut@subdivi.de>]

Package: src:gcc-4.9
Version: 4.9.2-7
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

When building a stage1 for i386 at some point of the build, dh_something
-plibx32gcc-4.9-dev-i386-cross fails, because the named package is not
in debian/control. It should be, because on unstable x32 multilib is
enabled for i386. The cause is that x32dev missing from addons at the
time of debian/control generation. Note how adding armml to addons is
symmetric wrt staged vs non-staged builds. Adding x32dev should be as
well. The attached patch achieves just that.

Helmut

diff -u gcc-4.9-4.9.2/debian/changelog gcc-4.9-4.9.2/debian/changelog
--- gcc-4.9-4.9.2/debian/changelog
+++ gcc-4.9-4.9.2/debian/changelog
@@ -1,3 +1,10 @@
+gcc-4.9 (4.9.2-7.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix: i386 stage1 builds packages not in control. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Mon, 15 Dec 2014 08:12:01 +0100
+
 gcc-4.9 (4.9.2-7) unstable; urgency=medium
 
   * Update to SVN 20141210 (r218575) from the gcc-4_9-branch.
diff -u gcc-4.9-4.9.2/debian/rules.conf gcc-4.9-4.9.2/debian/rules.conf
--- gcc-4.9-4.9.2/debian/rules.conf
+++ gcc-4.9-4.9.2/debian/rules.conf
@@ -650,6 +650,7 @@
   endif
   addons += $(if $(findstring armel,$(biarchhfarchs)),armml)
   addons += $(if $(findstring armhf,$(biarchsfarchs)),armml)
+  addons += $(if $(findstring amd64,$(biarchx32archs)),x32dev)
   ifeq ($(DEB_STAGE),stage2)
     addons += libgcc gccxbase
     ifeq ($(multilib),yes)