Unverified Commit d067aa03 authored by boklm's avatar boklm
Browse files

Bug 22115: use i386 containers for the linux32 build

parent 2d98c063
...@@ -8,7 +8,8 @@ distdir=/var/tmp/dist/binutils ...@@ -8,7 +8,8 @@ distdir=/var/tmp/dist/binutils
export DEB_BUILD_HARDENING_FORTIFY=1 export DEB_BUILD_HARDENING_FORTIFY=1
export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_FORMAT=1
export DEB_BUILD_HARDENING_PIE=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 # 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 # 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. # make sure it gets used before the non-PIC one would.
......
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
"ociVersion": "1.0.0-rc1", "ociVersion": "1.0.0-rc1",
"platform": { "platform": {
"os": "linux", "os": "linux",
"arch": "amd64" [% IF c("var/container/arch") == 'i386' -%]
"arch": "386"
[% ELSE -%]
"arch": "[% c("var/container/arch") %]"
[% END -%]
}, },
"process": { "process": {
"terminal": true, "terminal": true,
......
...@@ -27,23 +27,45 @@ targets: ...@@ -27,23 +27,45 @@ targets:
container: container:
suite: wheezy suite: wheezy
arch: amd64 arch: amd64
wheezy-i386:
var:
container:
suite: wheezy
arch: i386
jessie-amd64: jessie-amd64:
var: var:
container: container:
suite: jessie suite: jessie
arch: amd64 arch: amd64
jessie-i386:
var:
container:
suite: jessie
arch: i386
precise-amd64: precise-amd64:
var: var:
container: container:
suite: precise suite: precise
arch: amd64 arch: amd64
debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg 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: utopic-amd64:
var: var:
container: container:
suite: utopic suite: utopic
arch: amd64 arch: amd64
debootstrap_mirror: http://old-releases.ubuntu.com/ubuntu/ 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: 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' - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz'
......
...@@ -28,9 +28,8 @@ targets: ...@@ -28,9 +28,8 @@ targets:
var: var:
torbrowser_update_channel: default torbrowser_update_channel: default
linux-x86_64: linux:
var: var:
martools_filename: mar-tools-linux64.zip
arch_deps: arch_deps:
- libgtk2.0-dev - libgtk2.0-dev
- libdbus-glib-1-dev - libdbus-glib-1-dev
...@@ -44,25 +43,13 @@ targets: ...@@ -44,25 +43,13 @@ targets:
- libx11-xcb-dev - libx11-xcb-dev
# We built GCC but not the libmpc2, thus we need to install it # We built GCC but not the libmpc2, thus we need to install it
- libmpc2 - libmpc2
linux-x86_64:
var:
martools_filename: mar-tools-linux64.zip
linux-i686: linux-i686:
var: var:
martools_filename: mar-tools-linux32.zip 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: osx-x86_64:
var: var:
......
#!/bin/sh #!/bin/sh
[% c("var/set_default_env") -%] [% c("var/set_default_env") -%]
[% c("var/setarch") -%]
distdir=/var/tmp/dist/[% project %] distdir=/var/tmp/dist/[% project %]
mkdir /var/tmp/build mkdir /var/tmp/build
tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2 tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2
......
...@@ -4,12 +4,11 @@ version: 5.1.0 ...@@ -4,12 +4,11 @@ version: 5.1.0
var: var:
container: container:
use_container: 1 use_container: 1
configure_opt: --enable-multilib --enable-languages=c,c++ --with-arch_32=i686
deps: deps:
- build-essential - build-essential
- libmpc-dev - libmpc-dev
- libc6-dev-i386
setup: | setup: |
[% c("var/setarch") -%]
mkdir -p /var/tmp/dist mkdir -p /var/tmp/dist
tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %]
export PATH="/var/tmp/dist/gcc/bin:$PATH" export PATH="/var/tmp/dist/gcc/bin:$PATH"
...@@ -36,12 +35,20 @@ var: ...@@ -36,12 +35,20 @@ var:
popd popd
targets: targets:
osx-x86_64:
var:
configure_opt: --enable-multilib --enable-languages=c,c++
windows-i686: windows-i686:
var: var:
configure_opt: --disable-multilib --enable-languages=c,c++ 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: input_files:
- project: container-image - project: container-image
- URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.bz2' - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.bz2'
......
...@@ -31,17 +31,11 @@ var: ...@@ -31,17 +31,11 @@ var:
targets: targets:
master: master:
git_hash: master git_hash: master
linux-x86_64: linux:
var: var:
arch_deps: arch_deps:
- pkg-config - pkg-config
- libx11-dev - libx11-dev
linux-i686:
var:
arch_deps:
- pkg-config:i386
- libx11-dev:i386
- lib32stdc++6
input_files: input_files:
- project: container-image - project: container-image
......
#!/bin/bash #!/bin/bash
[% c("var/set_default_env") -%] [% c("var/set_default_env") -%]
[% c("var/setarch") -%]
distdir=/var/tmp/dist/[% project %] distdir=/var/tmp/dist/[% project %]
mkdir -p /var/tmp/dist mkdir -p /var/tmp/dist
......
...@@ -8,6 +8,7 @@ var: ...@@ -8,6 +8,7 @@ var:
use_container: 1 use_container: 1
setup: | setup: |
[% c("var/setarch") -%]
mkdir -p /var/tmp/dist mkdir -p /var/tmp/dist
tar -C /var/tmp/dist -xf $rootdir/[% c("go_tarfile") %] tar -C /var/tmp/dist -xf $rootdir/[% c("go_tarfile") %]
export GOOS=[% c("var/GOOS") %] export GOOS=[% c("var/GOOS") %]
......
...@@ -9,13 +9,7 @@ var: ...@@ -9,13 +9,7 @@ var:
use_container: 1 use_container: 1
targets: targets:
linux-i686: linux:
var:
arch_deps:
- pkg-config
- libx11-dev:i386
- lib32stdc++6
linux-x86_64:
var: var:
arch_deps: arch_deps:
- pkg-config - pkg-config
......
...@@ -21,22 +21,18 @@ targets: ...@@ -21,22 +21,18 @@ targets:
git_hash: master git_hash: master
tag_gpg_id: 0 tag_gpg_id: 0
linux-i686: linux:
var: var:
libdir: lib32
sort_deps: 0
arch_deps: arch_deps:
- libc6-dev-i386
- libtool - libtool
- zlib1g-dev:i386 - zlib1g-dev
- hardening-wrapper - hardening-wrapper
linux-i686:
var:
libdir: lib
linux-x86_64: linux-x86_64:
var: var:
libdir: lib64 libdir: lib64
arch_deps:
- libtool
- zlib1g-dev
- hardening-wrapper
osx-x86_64: osx-x86_64:
var: var:
arch_deps: arch_deps:
......
...@@ -26,28 +26,6 @@ targets: ...@@ -26,28 +26,6 @@ targets:
var: var:
webrtc: webrtc:
os: linux 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: arch_deps:
- libasound2-dev - libasound2-dev
- libexpat1-dev - libexpat1-dev
...@@ -58,6 +36,14 @@ targets: ...@@ -58,6 +36,14 @@ targets:
- libxext-dev - libxext-dev
- libxrandr-dev - libxrandr-dev
- pkg-config - pkg-config
linux-i686:
var:
webrtc:
arch: ia32
lib_arch: 386
lib_path: lib/libwebrtc-linux-386-magic.a
linux-x86_64:
var:
webrtc: webrtc:
arch: x64 arch: x64
lib_arch: amd64 lib_arch: amd64
......
...@@ -111,26 +111,30 @@ targets: ...@@ -111,26 +111,30 @@ targets:
var: var:
linux-x86_64: 1 linux-x86_64: 1
osname: linux-x86_64 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 # We only build snowflake on linux-x86_64 for now
snowflake: 1 snowflake: 1
container:
arch: amd64
linux-i686: linux-i686:
arch: i686 arch: i686
var: var:
linux-i686: 1 linux-i686: 1
osname: linux-i686 osname: linux-i686
configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32' container:
pre_pkginst: dpkg --add-architecture i386 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: deps:
- libc6-dev-i386
- build-essential - build-essential
- python - python
- bison - bison
...@@ -139,13 +143,6 @@ targets: ...@@ -139,13 +143,6 @@ targets:
- libtool - libtool
- zip - zip
- unzip - unzip
linux:
var:
linux: 1
compiler: gcc
container:
suite: wheezy
arch: amd64
torbrowser-windows-i686: torbrowser-windows-i686:
- windows-i686 - windows-i686
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment