diff --git a/travis/build.sh b/travis/build.sh index 23f8f2d..05cf46e 100755 --- a/travis/build.sh +++ b/travis/build.sh @@ -42,8 +42,24 @@ make -j$(nproc) ## Run Unit Tests ctest -V +strip_path=$(which strip) + +if [ "$ARCH" == "i386" ]; then + # download i386 strip for i386 AppImage + # https://github.com/linuxdeploy/linuxdeploy/issues/59 + wget http://security.ubuntu.com/ubuntu/pool/main/b/binutils/binutils-multiarch_2.24-5ubuntu14.2_i386.deb + echo "0106f170cebf5800e863a558cad039e4f16a76d3424ae943209c3f6b0cacd511 binutils-multiarch_2.24-5ubuntu14.2_i386.deb" | sha256sum -c + wget http://security.ubuntu.com/ubuntu/pool/main/b/binutils/binutils-multiarch-dev_2.24-5ubuntu14.2_i386.deb + echo "ed9ca4fbbf492233228f79fae6b349a2ed2ee3e0927bdc795425fccf5fae648e binutils-multiarch-dev_2.24-5ubuntu14.2_i386.deb" | sha256sum -c + dpkg -x binutils-multiarch_2.24-5ubuntu14.2_i386.deb out/ + dpkg -x binutils-multiarch-dev_2.24-5ubuntu14.2_i386.deb out/ + rm binutils-multiarch*.deb + strip_path=$(readlink -f out/usr/bin/strip) + export LD_LIBRARY_PATH=$(readlink -f out/usr/lib) +fi + # args are used more than once -LINUXDEPLOY_ARGS=("--appdir" "AppDir" "-e" "bin/linuxdeploy" "-i" "$REPO_ROOT/resources/linuxdeploy.png" "--create-desktop-file" "-e" "/usr/bin/patchelf" "-e" "/usr/bin/strip") +LINUXDEPLOY_ARGS=("--appdir" "AppDir" "-e" "bin/linuxdeploy" "-i" "$REPO_ROOT/resources/linuxdeploy.png" "--create-desktop-file" "-e" "/usr/bin/patchelf" "-e" "$strip_path") # deploy patchelf which is a dependency of linuxdeploy bin/linuxdeploy "${LINUXDEPLOY_ARGS[@]}"