timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-23 11:30:14 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fix linux 32 bit builds (#85)

Browse Source 
* Correct Linux 32-bit dependency installation
This commit is contained in:
Peter Squicciarini
2019-02-14 19:40:11 -05:00
committed by GitHub
parent 4cf7166a48
commit c38cc161c0
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -16,7 +16,7 @@ node_js: "8"
before_install: before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash - curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH="$HOME/.yarn/bin:$PATH" - export PATH="$HOME/.yarn/bin:$PATH"
- ./install_deps.sh - . install_deps.sh
- . get_repo.sh - . get_repo.sh
- . check_tags.sh - . check_tags.sh

18
install_deps.sh
View File

@@ -5,16 +5,28 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew install jq zip brew install jq zip
else else
sudo apt-get update sudo apt-get update
sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev fakeroot rpm jq sudo apt-get install -y fakeroot rpm jq
if [[ "$BUILDARCH" == "ia32" ]]; then if [[ "$BUILDARCH" == "ia32" ]]; then
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt-get update sudo apt-get update
sudo apt-get install libc6-dev-i386 gcc-multilib g++-multilib sudo apt-get install -y gcc-multilib g++-multilib
sudo apt-get install libx11-dev:i386 libxkbfile-dev:i386 sudo apt-get install -y \
libgirepository-1.0-1:i386 \
gir1.2-glib-2.0:i386 \
libglib2.0-dev:i386 \
gir1.2-secret-1:i386 \
libx11-dev:i386 \
libxkbfile-dev:i386 \
libsecret-1-dev:i386
export CFLAGS=-m32
export CXXFLAGS=-m32
export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
elif [[ $BUILDARCH == "arm64" ]]; then elif [[ $BUILDARCH == "arm64" ]]; then
# Use the default C / C++ compilers, # Use the default C / C++ compilers,
# because some makefiles default to CC:=gcc: # because some makefiles default to CC:=gcc:
export CC=/usr/bin/cc export CC=/usr/bin/cc
export CXX=/usr/bin/c++ export CXX=/usr/bin/c++
else
sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev fakeroot rpm jq
fi fi
fi fi