From d73ef25178eb107680388e221ce55fa24b51ce5c Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Thu, 30 Jul 2020 17:51:35 +0200 Subject: v79.0-1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also (re-)adds some debian armhf-patches – not really needed, but making it easier to apply the libstdc++-related patches without having to modify them. --- binary_tarball/scripts/3_Configure_Source_Code.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'binary_tarball/scripts/3_Configure_Source_Code.sh') diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh index 84b4858..99e3d6a 100755 --- a/binary_tarball/scripts/3_Configure_Source_Code.sh +++ b/binary_tarball/scripts/3_Configure_Source_Code.sh @@ -1,6 +1,8 @@ #!/bin/bash printf "\n\n------------------------------ FINAL PREBUILD CONFIGURATION ---------------------------------\n"; +set -e + # Setup Script Variables srcdir=$1; CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)} @@ -87,7 +89,7 @@ END export CXXFLAGS+=" -g0" export RUSTFLAGS="-Cdebuginfo=0" - export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" + export LDFLAGS+=" -Wl,--no-keep-memory -Wl" patch -p1 -i ${CI_PROJECT_DIR}/arm.patch wget https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch -O ${CI_PROJECT_DIR}/build-arm-libopus.patch patch -p1 -i ${CI_PROJECT_DIR}/build-arm-libopus.patch @@ -110,7 +112,13 @@ END fi # hopefully the magic sauce that makes things build on 16.04 and later on work "everywhere": +patch -p1 -i "${CI_PROJECT_DIR}/armhf-reduce-linker-memory-use.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/build-with-libstdc++-7.patch" +patch -p1 -i "${CI_PROJECT_DIR}/fix-armhf-webrtc-build.patch" +patch -p1 -i "${CI_PROJECT_DIR}/webrtc-fix-compiler-flags-for-armhf.patch" + +# https://bugzilla.mozilla.org/show_bug.cgi?id=1654465 +patch -p1 -i ${CI_PROJECT_DIR}/bug1654465.diff # Remove some pre-installed addons that might be questionable patch -p1 -i ${CI_PROJECT_DIR}/remove_addons.patch -- cgit