diff options
| author |   Eric Hameleers <alien@slackware.com> | 2023-01-23 20:30:59 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2023-01-23 20:30:59 +0000 |
| commit | a0e724d9862936faf2bf856f63aee03b59e0c2da (patch) | |
| tree | daf96f7af72f03456130c24413c55769ce68275d | |
| parent | 16a573dddbcb2ffda62160a73b9ff50fde39b776 (diff) | |
| download | asb-a0e724d9862936faf2bf856f63aee03b59e0c2da.tar.gz asb-a0e724d9862936faf2bf856f63aee03b59e0c2da.tar.xz | |
chromium: fixes contributed by Jan Rafaj
| -rwxr-xr-x | chromium/build/chromium.SlackBuild | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild index aba87808..0e2abcfe 100755 --- a/chromium/build/chromium.SlackBuild +++ b/chromium/build/chromium.SlackBuild @@ -31,7 +31,7 @@ # URL: http://www.chromium.org/ # Build needs: - ninja; # - nodejs >= 15.6.0; -# - gcc >= 8 , llvm >= 8 for bootstrapping gn; +# - gcc >= 8 , llvm >= 16 for bootstrapping gn; # - nasm >= 2.14 (yasm no longer being used); # - cmake >= 3.13.4; # - python3 >= 3.7, python3-setuptools; @@ -592,9 +592,10 @@ FFMPEG_HEVC=${FFMPEG_HEVC:-1} USE_CLANG=${USE_CLANG:-1} # Build a custom clang or use the system clang? -# CLANG_MIN is the minimal clang version needed to compile chromium: -CLANG_MIN=12 -if [ $(clang --version |grep '^clang' |cut -d' ' -f3 |cut -d. -f1) -ge ${CLANG_MIN} ]; then +# CLANG_MIN is the minimal clang version needed to compile chromium, +# see 'CLANG_REVISION' in ./tools/clang/scripts/update.py : +CLANG_MIN=16 +if [ $(clang -dumpversion |cut -d. -f1) -ge ${CLANG_MIN} ]; then BUILD_CLANG=${BUILD_CLANG:-0} else BUILD_CLANG=${BUILD_CLANG:-1} @@ -871,7 +872,7 @@ cat $SRCDIR/patches/chromium_gcc10.patch | patch -p1 --verbose \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log # Fix the link on 32bit: sed -e '/ldflags /s/-m32/&", "-Wl,-z,notext/' \ - -i build/config/compiler/BUILD.gn + -i build/config/compiler/BUILD.gn \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log if [ "$ARCH" == "i586" ] ; then # Don't complain about unsupported flags when we add @@ -1380,7 +1381,8 @@ ninja -C out/Release \ chrome chrome_sandbox chromedriver \ 2>&1 | tee $OUTPUT/ninja-${PRGNAM}.log -if [ $USE_UNGOOGLED -eq 0 ]; then +if [ $USE_UNGOOGLED -eq 0 ] && [ ! -f out/Release/chrome_crashpad_handler ] +then # ungoogled-chromium has crash-reporting disabled: LDFLAGS="$LDFLAGS" \ LC_ALL=C \ |