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

Bug 22115: use i386 containers for the win32 build

parent d067aa03
#!/bin/bash
[% c("var/setarch") -%]
[% c("var/set_default_env") -%]
[% IF c("var/windows") -%]
mkdir -p /var/tmp/dist
......
......@@ -38,6 +38,9 @@ targets:
windows-i686:
var:
configure_opt: --disable-multilib --enable-languages=c,c++
arch_deps:
- libc6-dev
- zlib1g-dev
linux-i686:
var:
configure_opt: --enable-multilib --enable-languages=c,c++ --with-system-zlib
......
......@@ -13,6 +13,7 @@ var:
- libmpc-dev
- g++-mingw-w64-i686
setup: |
[% c("var/setarch") -%]
mkdir -p /var/tmp/dist
tar -C /var/tmp/dist -xf [% c("compiler_tarfile") %]
export PATH="/var/tmp/dist/mingw-w64/helpers:/var/tmp/dist/mingw-w64/bin:$PATH"
......
......@@ -201,19 +201,6 @@ popd
[% IF c("var/windows") %]
# We need to install a recent version of python-pefile so that it works
# in a x86_64 container:
# https://github.com/TheTorProject/tor-messenger-build/pull/10
tar xf $rootdir/[% c('input_files_by_name/python-future') %]
cd $(echo [% c('input_files_by_name/python-future') %] | sed s/\.tar\.gz$//)
python setup.py install --user
cd ..
tar xf $rootdir/[% c('input_files_by_name/python-pefile') %]
cd $(echo [% c('input_files_by_name/python-pefile') %] | sed s/\.tar\.gz$//)
python setup.py install --user
cd ..
tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/nsis') %]
export PATH="/var/tmp/dist/nsis/bin:$PATH"
......
......@@ -27,8 +27,8 @@ targets:
windows-i686:
var:
mar_osname: win32
container:
suite: utopic
arch_deps:
- python-pefile
input_files:
- project: container-image
......@@ -70,11 +70,3 @@ input_files:
enable: '[% c("var/windows") %]'
- filename: pe_checksum_fix.py
enable: '[% c("var/windows") %]'
- name: python-future
URL: https://pypi.python.org/packages/00/2b/8d082ddfed935f3608cc61140df6dcbf0edea1bc3ab52fb6c29ae3e81e85/future-0.16.0.tar.gz
sha256sum: e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb
enable: '[% c("var/windows") %]'
- name: python-pefile
URL: https://pypi.python.org/packages/92/c0/8589ce9734ffdba258bd3e5acd4afb2e3586c121fe73402f686288b684b0/pefile-2016.3.28.tar.gz
sha256sum: f24021085b5c3ef7b0898bb1f1d93eecd3839e03512769e22b0c5a10d9095f7b
enable: '[% c("var/windows") %]'
......@@ -153,7 +153,7 @@ targets:
osname: windows-i686
container:
suite: precise
arch: amd64
arch: i386
configure_opt: '--host=i686-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"'
CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security'
LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs'
......@@ -168,6 +168,12 @@ targets:
- zip
- unzip
faketime_path: /usr/lib/faketime/libfaketime.so.1
setarch: |
if test -z "$RBM_SETARCH"
then
export RBM_SETARCH=1
exec setarch i686 ./build
fi
torbrowser-osx-x86_64:
- osx-x86_64
......
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