librewolf-bot/linux
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

drop rfp patch; wasm/wasi workaround; arm64 now finally has llvm 13, it seems?

Browse source
This commit is contained in:
ohfp 2021-12-12 13:42:20 +01:00
parent 436df47576
commit a23f3c6390
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/1_Install_Dependencies.sh
View file

@ -57,11 +57,12 @@ if [[ $CARCH == 'x86_64' ]];then
apt-get update apt-get update
apt-get -y install clang-13 libclang-13-dev apt-get -y install clang-13 libclang-13-dev
else else
# seems like we can use 13 here as well, finally?
apt install -y software-properties-common apt-transport-https ca-certificates apt install -y software-properties-common apt-transport-https ca-certificates
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add
apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main" apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-13 main"
apt-get update apt-get update
apt-get -y install clang-10 libclang-10-dev apt-get -y install clang-13 libclang-13-dev
fi fi
# we need a more recent rust # we need a more recent rust

16
scripts/3_Configure_Source_Code.sh
View file

@ -70,6 +70,9 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0
# options for ci / weaker build systems # options for ci / weaker build systems
# mk_add_options MOZ_MAKE_FLAGS="-j4" # mk_add_options MOZ_MAKE_FLAGS="-j4"
# ac_add_options --enable-linker=gold # ac_add_options --enable-linker=gold
# required for 95.0 for now, it seems
ac_add_options --without-wasm-sandboxed-libraries
END END
# allow setting limited resource usage via ENV / CI: # allow setting limited resource usage via ENV / CI:
@ -83,11 +86,11 @@ if [[ $CARCH == 'aarch64' ]]; then
# taken from manjaro build: # taken from manjaro build:
ac_add_options --enable-optimize="-g0 -O2" ac_add_options --enable-optimize="-g0 -O2"
export CC='clang-10' export CC='clang-13'
export CXX='clang++-10' export CXX='clang++-13'
export AR=llvm-ar-10 export AR=llvm-ar-13
export NM=llvm-nm-10 export NM=llvm-nm-13
export RANLIB=llvm-ranlib-10 export RANLIB=llvm-ranlib-13
END END
export MOZ_DEBUG_FLAGS=" " export MOZ_DEBUG_FLAGS=" "
@ -166,7 +169,8 @@ patch -Np1 -i "${_PATCHES_DIR}/search-config.patch"
patch -Np1 -i "${_PATCHES_DIR}/sed-patches/stop-undesired-requests.patch" patch -Np1 -i "${_PATCHES_DIR}/sed-patches/stop-undesired-requests.patch"
# allow overriding the color scheme light/dark preference with RFP # allow overriding the color scheme light/dark preference with RFP
patch -Np1 -i ${_PATCHES_DIR}/allow_dark_preference_with_rfp.patch # deprecated / will be dropped soon
# patch -Np1 -i ${_PATCHES_DIR}/allow_dark_preference_with_rfp.patch
# fix an URL in 'about' dialog # fix an URL in 'about' dialog
patch -Np1 -i ${_PATCHES_DIR}/about-dialog.patch patch -Np1 -i ${_PATCHES_DIR}/about-dialog.patch