summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-10-28 08:27:24 +0000
committer Eric Hameleers <alien@slackware.com>2017-10-28 08:27:24 +0000
commit13fb8fa249035e14030dc2c7ebdc23a2fb690b85 (patch)
tree94496039da480b2896a25ac84da14ec9a7c1ce00
parentcfee746f8bf4f820af738ec6a26d758f8f6e65f0 (diff)
downloadasb-13fb8fa249035e14030dc2c7ebdc23a2fb690b85.tar.gz
asb-13fb8fa249035e14030dc2c7ebdc23a2fb690b85.tar.xz
chromium: updated to 62.0.3202.75, switched to clang compiler
-rwxr-xr-xchromium/build/chromium.SlackBuild26
1 files changed, 16 insertions, 10 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild
index f66560f..24e63e4 100755
--- a/chromium/build/chromium.SlackBuild
+++ b/chromium/build/chromium.SlackBuild
@@ -290,6 +290,9 @@
# 62.0.3202.62-1:
# 18/oct/2017 by Eric Hameleers <alien@slackware.com>
# * Update to 62.
+# 62.0.3202.75-1:
+# 27/oct/2017 by Eric Hameleers <alien@slackware.com>
+# * Update, switch compiler to clang instead of gcc.
#
# -----------------------------------------------------------------------------
#
@@ -302,7 +305,7 @@
SRCNAM=chromium
SRCEXT=${SRCEXT:-""} # could be "-dev" for development build
PRGNAM=${SRCNAM}${SRCEXT} # chromium or chromium-dev
-VERSION=${VERSION:-62.0.3202.62}
+VERSION=${VERSION:-62.0.3202.75}
BUILD=${BUILD:-1}
TAG=${TAG:-alien}
@@ -331,8 +334,8 @@ USE_FFMPEG=${USE_FFMPEG:-shared} # other option is "static"
USE_NACL=${USE_NACL:-1}
# Use the clang compiler. Results in faster build and smaller binaries.
-# I default this to "off" because it is untested:
-USE_CLANG=${USE_CLANG:-0}
+# I default this to "1" (on) because gcc support is getting stale:
+USE_CLANG=${USE_CLANG:-1}
# If you don't want to enable support for Widevine CDM
# (content decryption module) say "0" here.
@@ -555,8 +558,6 @@ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
if [ "$ARCH" != "x86_64" ]; then
# For now, disable NaCl except on x86_64 because the precompiled toolchain is
# only available for that architecture at the moment.
- echo "** Not using clang - architecture '$ARCH' is currently unsupported."
- USE_CLANG=0
echo "** Not building NaCL - architecture '$ARCH' is currently unsupported."
USE_NACL=0
fi
@@ -581,7 +582,7 @@ if [ "x$SRCEXT" = "x-dev" ]; then
fi
if [ "$USE_CLANG" = "1" ]; then
- # is_clang=true uses clang instead of gcc. Does not work on 32bit though.
+ # use_clang=true uses clang instead of gcc. Does not work on 32bit though.
# clang_use_chrome_plugins=true fails with clang 3.5 - disable for now.
export CC="clang"
export CXX="clang++"
@@ -727,11 +728,16 @@ if [ ${USE_NACL} -eq 1 ]; then
2>&1 | tee $OUTPUT/nacl_dl-${PRGNAM}.log
fi
if [ ${USE_CLANG} -eq 1 -o ${USE_NACL} -eq 1 ]; then
- # Download clang from Google, required for building NaCL.
- # Also required when building for ARCH="x86_64" using clang:
- echo "-- Downloading clang toolchains."
+ ## Download clang from Google, required for building NaCL.
+ ## Also required when building for ARCH="x86_64" using clang:
+ #echo "-- Downloading clang toolchains."
+ #python2 tools/clang/scripts/update.py \
+ # 2>&1 | tee $OUTPUT/clang_dl-${PRGNAM}.log
+ # Build clang from source instead of downloading:
+ echo "-- Building google's clang toolchain."
python2 tools/clang/scripts/update.py \
- 2>&1 | tee $OUTPUT/clang_dl-${PRGNAM}.log
+ --force-local-build --gcc-toolchain /usr --without-android \
+ 2>&1 | tee $OUTPUT/clang_build-${PRGNAM}.log
fi
# Generate the ninja build files: