commit a26af78053453ab2165066f9c1b3966cf09d4fcb Author: Arlo Breault <arlolra@gmail.com> Date: Sat Aug 27 15:48:43 2016 -0700 More linux-i686 fixin' --- projects/instantbird/config | 31 ++++++++++++++++++++----------- projects/tor-messenger/config | 2 +- rbm.conf | 1 + 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index 1223804..bef6465 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -9,23 +9,12 @@ var: deps: - build-essential - libmpc-dev - - libgconf2-dev - - autotools-dev - autoconf2.13 - python - zip - - libgtk2.0-dev - libidl-dev - - libxt-dev - - libxml2-dev - uuid-runtime - imagemagick - - mesa-common-dev - - libdbus-1-dev - - libdbus-glib-1-dev - - libasound2-dev - - libgstreamer-plugins-base0.10-dev - - libpulse-dev - ccache targets: windows-i686: @@ -37,6 +26,16 @@ targets: var: arch_deps: - yasm + - libgconf2-dev + - libgtk2.0-dev + - libxml2-dev + - mesa-common-dev + - libdbus-1-dev + - libdbus-glib-1-dev + - libasound2-dev + - libgstreamer-plugins-base0.10-dev + - libpulse-dev + - libxt-dev linux-i686: var: arch_deps: @@ -45,6 +44,16 @@ targets: - lib32z1-dev - lib32asound2-dev - yasm + - libgconf2-dev:i386 + - libgtk2.0-dev:i386 + - libxml2-dev:i386 + - mesa-common-dev:i386 + - libdbus-1-dev:i386 + - libdbus-glib-1-dev:i386 + - libasound2-dev:i386 + - libgstreamer-plugins-base0.10-dev:i386 + - libpulse-dev:i386 + - libxt-dev:i386 osx-x86_64: var: arch_deps: diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 19e98b6..dc0a28b 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -29,7 +29,7 @@ input_files: - project: docker-image remote_docker: 1 -distribution: Ubuntu-12.04 +distribution: Debian-7.11 var: filename_ext: 'tar.xz' deps: diff --git a/rbm.conf b/rbm.conf index 61a5f35..f2084c5 100644 --- a/rbm.conf +++ b/rbm.conf @@ -41,6 +41,7 @@ targets: osname: linux-i686 configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32' compiler: gcc + pre_pkginst: dpkg --add-architecture i386 windows-i686: distribution: Ubuntu-14.10 arch: i686