Bug 22115: use i386 containers for the linux32 build

projects/binutils/build

@@ -8,7 +8,8 @@ distdir=/var/tmp/dist/binutils
   export DEB_BUILD_HARDENING_FORTIFY=1
   export DEB_BUILD_HARDENING_FORMAT=1
   export DEB_BUILD_HARDENING_PIE=1
-
+[% END -%]
+[% IF c("var/linux-x86_64") %]
   # The libstdc++ shipped by default is non-PIC which breaks the binutils build
   # if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND
   # make sure it gets used before the non-PIC one would.

projects/common/runc-config.json

@@ -2,7 +2,11 @@
 	"ociVersion": "1.0.0-rc1",
 	"platform": {
 		"os": "linux",
-		"arch": "amd64"
+[% IF c("var/container/arch") == 'i386' -%]
+		"arch": "386"
+[% ELSE -%]
+		"arch": "[% c("var/container/arch") %]"
+[% END -%]
 	},
 	"process": {
 		"terminal": true,

projects/debootstrap-image/config

@@ -27,23 +27,45 @@ targets:
       container:
         suite: wheezy
         arch: amd64
+  wheezy-i386:
+    var:
+      container:
+        suite: wheezy
+        arch: i386
   jessie-amd64:
     var:
       container:
         suite: jessie
         arch: amd64
+  jessie-i386:
+    var:
+      container:
+        suite: jessie
+        arch: i386
   precise-amd64:
     var:
       container:
         suite: precise
         arch: amd64
         debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+  precise-i386:
+    var:
+      container:
+        suite: precise
+        arch: i386
+        debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
   utopic-amd64:
     var:
       container:
         suite: utopic
         arch: amd64
         debootstrap_mirror: http://old-releases.ubuntu.com/ubuntu/
+  utopic-i386:
+    var:
+      container:
+        suite: utopic
+        arch: i386
+        debootstrap_mirror: http://old-releases.ubuntu.com/ubuntu/
 
 input_files:
   - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz'

projects/firefox/config

@@ -28,9 +28,8 @@ targets:
     var:
       torbrowser_update_channel: default
 
-  linux-x86_64:
+  linux:
     var:
-      martools_filename: mar-tools-linux64.zip
       arch_deps:
         - libgtk2.0-dev
         - libdbus-glib-1-dev
@@ -44,25 +43,13 @@ targets:
         - libx11-xcb-dev
         # We built GCC but not the libmpc2, thus we need to install it
         - libmpc2
+  linux-x86_64:
+    var:
+      martools_filename: mar-tools-linux64.zip
 
   linux-i686:
     var:
       martools_filename: mar-tools-linux32.zip
-      sort_deps: 0
-      arch_deps:
-        - libc6-dev-i386
-        - libgtk2.0-dev:i386
-        - libdbus-glib-1-dev:i386
-        - libxt-dev:i386
-        # To pass configure since ESR 31.
-        - libpulse-dev:i386
-        # To pass configure since ESR 45.
-        - libgconf2-dev:i386
-        # To pass configure since ESR 52
-        - libx11-xcb-dev:i386
-        # We built GCC but not the libmpc2, thus we need to install it
-        - libmpc2
-        - hardening-wrapper
 
   osx-x86_64:
     var:

projects/gcc/build

 #!/bin/sh
 [% c("var/set_default_env") -%]
+[% c("var/setarch") -%]
 distdir=/var/tmp/dist/[% project %]
 mkdir /var/tmp/build
 tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2

projects/gcc/config

@@ -4,12 +4,11 @@ version: 5.1.0
 var:
   container:
     use_container: 1
-  configure_opt: --enable-multilib --enable-languages=c,c++ --with-arch_32=i686
   deps:
     - build-essential
     - libmpc-dev
-    - libc6-dev-i386
   setup: |
+    [% c("var/setarch") -%]
     mkdir -p /var/tmp/dist
     tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %]
     export PATH="/var/tmp/dist/gcc/bin:$PATH"
@@ -36,12 +35,20 @@ var:
     popd
 
 targets:
-  osx-x86_64:
-    var:
-      configure_opt: --enable-multilib --enable-languages=c,c++
   windows-i686:
     var:
       configure_opt: --disable-multilib --enable-languages=c,c++
+  linux-i686:
+    var:
+      configure_opt: --enable-multilib --enable-languages=c,c++ --with-system-zlib
+      arch_deps:
+        - libc6-dev
+        - zlib1g-dev
+  linux-x86_64:
+    var:
+      configure_opt: --enable-multilib --enable-languages=c,c++ --with-arch_32=i686
+      arch_deps:
+        - libc6-dev-i386
 input_files:
   - project: container-image
   - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.bz2'

projects/go-webrtc/config

@@ -31,17 +31,11 @@ var:
 targets:
   master:
     git_hash: master
-  linux-x86_64:
+  linux:
     var:
       arch_deps:
         - pkg-config
         - libx11-dev
-  linux-i686:
-    var:
-      arch_deps:
-        - pkg-config:i386
-        - libx11-dev:i386
-        - lib32stdc++6
 
 input_files:
   - project: container-image

projects/go/build

 #!/bin/bash
 [% c("var/set_default_env") -%]
+[% c("var/setarch") -%]
 distdir=/var/tmp/dist/[% project %]
 mkdir -p /var/tmp/dist
 

projects/go/config

@@ -8,6 +8,7 @@ var:
     use_container: 1
 
   setup: |
+    [% c("var/setarch") -%]
     mkdir -p /var/tmp/dist
     tar -C /var/tmp/dist -xf $rootdir/[% c("go_tarfile") %]
     export GOOS=[% c("var/GOOS") %]

projects/snowflake/config

@@ -9,13 +9,7 @@ var:
     use_container: 1
 
 targets:
-  linux-i686:
-    var:
-      arch_deps:
-        - pkg-config
-        - libx11-dev:i386
-        - lib32stdc++6
-  linux-x86_64:
+  linux:
     var:
       arch_deps:
         - pkg-config

projects/tor/config

@@ -21,22 +21,18 @@ targets:
     git_hash: master
     tag_gpg_id: 0
 
-  linux-i686:
+  linux:
     var:
-      libdir: lib32
-      sort_deps: 0
       arch_deps:
-        - libc6-dev-i386
         - libtool
-        - zlib1g-dev:i386
+        - zlib1g-dev
         - hardening-wrapper
+  linux-i686:
+    var:
+      libdir: lib
   linux-x86_64:
     var:
       libdir: lib64
-      arch_deps:
-        - libtool
-        - zlib1g-dev
-        - hardening-wrapper
   osx-x86_64:
     var:
       arch_deps:

projects/webrtc/config

@@ -26,28 +26,6 @@ targets:
     var:
       webrtc:
         os: linux
-  linux-i686:
-    var:
-      sort_deps: 0
-      arch_deps:
-        - lib32asound2-dev
-        - lib64expat1
-        - libexpat1-dev:i386
-        - libglib2.0-dev:i386
-        - libgtk2.0-dev:i386
-        - libudev-dev:i386
-        - libx11-dev:i386
-        - libxext-dev:i386
-        - libxrandr-dev:i386
-        - lib32stdc++6
-        - pkg-config
-        - hardening-wrapper
-      webrtc:
-        arch: ia32
-        lib_arch: 386
-        lib_path: lib/libwebrtc-linux-386-magic.a
-  linux-x86_64:
-    var:
       arch_deps:
         - libasound2-dev
         - libexpat1-dev
@@ -58,6 +36,14 @@ targets:
         - libxext-dev
         - libxrandr-dev
         - pkg-config
+  linux-i686:
+    var:
+      webrtc:
+        arch: ia32
+        lib_arch: 386
+        lib_path: lib/libwebrtc-linux-386-magic.a
+  linux-x86_64:
+    var:
       webrtc:
         arch: x64
         lib_arch: amd64

rbm.conf

@@ -111,26 +111,30 @@ targets:
     var:
       linux-x86_64: 1
       osname: linux-x86_64
-      deps:
-        - build-essential
-        - python
-        - bison
-        - hardening-wrapper
-        - automake
-        - libtool
-        - zip
-        - unzip
       # We only build snowflake on linux-x86_64 for now
       snowflake: 1
+      container:
+        arch: amd64
   linux-i686:
     arch: i686
     var:
       linux-i686: 1
       osname: linux-i686
-      configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32'
-      pre_pkginst: dpkg --add-architecture i386
+      container:
+        arch: i386
+      setarch: |
+        if test -z "$RBM_SETARCH"
+        then
+           export RBM_SETARCH=1
+           exec setarch i686 ./build
+        fi
+  linux:
+    var:
+      linux: 1
+      compiler: gcc
+      container:
+        suite: wheezy
       deps:
-        - libc6-dev-i386
         - build-essential
         - python
         - bison
@@ -139,13 +143,6 @@ targets:
         - libtool
         - zip
         - unzip
-  linux:
-    var:
-      linux: 1
-      compiler: gcc
-      container:
-        suite: wheezy
-        arch: amd64
 
   torbrowser-windows-i686:
     - windows-i686