summaryrefslogtreecommitdiffstats
path: root/chromium/build/chromium.SlackBuild
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2018-03-16 20:52:43 +0000
committer Eric Hameleers <alien@slackware.com>2018-03-16 20:52:43 +0000
commit99a3f0ee172fe2dfd60c3b05841938da6cf3d796 (patch)
tree69ed006c0e3ae5ccb295259867d6ccf1c0be498b /chromium/build/chromium.SlackBuild
parent0044b86f2c86af243cd5016254cfbb0213ba903b (diff)
downloadasb-99a3f0ee172fe2dfd60c3b05841938da6cf3d796.tar.gz
asb-99a3f0ee172fe2dfd60c3b05841938da6cf3d796.tar.xz
chromium: updated to 65.0.3325.162.
Get rid of several gcc/glibc related patches by setting 'use_custom_libcxx' to 'true'
Diffstat (limited to 'chromium/build/chromium.SlackBuild')
-rwxr-xr-xchromium/build/chromium.SlackBuild32
1 files changed, 7 insertions, 25 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild
index ed9fbc59..e76e4373 100755
--- a/chromium/build/chromium.SlackBuild
+++ b/chromium/build/chromium.SlackBuild
@@ -317,6 +317,9 @@
# 65.0.3325.146-1:
# 09/mar/2018 by Eric Hameleers <alien@slackware.com>
# * Update to M65.
+# 65.0.3325.162-1:
+# 16/mar/2018 by Eric Hameleers <alien@slackware.com>
+# * Update.
#
#
# -----------------------------------------------------------------------------
@@ -330,7 +333,7 @@
SRCNAM=chromium
SRCEXT=${SRCEXT:-""} # could be "-dev" for development build
PRGNAM=${SRCNAM}${SRCEXT} # chromium or chromium-dev
-VERSION=${VERSION:-65.0.3325.146}
+VERSION=${VERSION:-65.0.3325.162}
BUILD=${BUILD:-1}
TAG=${TAG:-alien}
@@ -559,26 +562,6 @@ cd ${SRCNAM}-${VERSION}
# Patches:
touch $OUTPUT/patch-${PRGNAM}.log
-# ---------------------------------------------------------------------------
-# Several patches were needed to make M65 compile on Slackware 14.2:
-# Add mising math includes:
-cat $SRCDIR/patches/chromium_gcc_round_fix.patch | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-cat $SRCDIR/patches/chromium_math.h-r0.patch | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-# Add missing stdint include:
-cat $SRCDIR/patches/chromium_stdint.patch | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-# As long as I can't figure out why the build keeps using our gcc and clang
-# in isolated spots, I have to fix that by re-introducing compatibility:
-cat $SRCDIR/patches/chromium_gcc5_2.patch | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-cat $SRCDIR/patches/chromium_clang-r3.patch | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-# Revert commit "[gpu] Switch to std::tuple for FormatType":
-cat $SRCDIR/patches/chromium_revert_tuple.patch | patch -p1 -R --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-# ---------------------------------------------------------------------------
# When compiling google's clang on 32bit Slackware use 'i586' in the triplet.
# I am a python noob so this is clumsy, better implementation is welcome :-)
cp $SRCDIR/patches/clang.toolchains.i586.triple.diff .
@@ -682,7 +665,6 @@ _chromium_conf=(
"enable_hevc_demuxing=${do_hevc}"
'enable_hidpi=true'
"enable_hotwording=${do_hotword}"
- 'enable_glibc=false'
"enable_nacl=${do_nacl}"
"enable_nacl_nonsfi=${do_nacl}"
'enable_pepper_cdms=true'
@@ -714,7 +696,7 @@ _chromium_conf=(
'use_allocator="none"'
'use_bundled_fontconfig=false'
'use_cups=true'
- 'use_custom_libcxx=false'
+ 'use_custom_libcxx=true'
'use_gconf=false'
'use_gold=false'
'use_kerberos=false'
@@ -849,7 +831,7 @@ fi
# Generate the ninja build files:
echo "-- Bootstrapping 'gn'."
python2 tools/gn/bootstrap/bootstrap.py \
- -v --gn-gen-args "${_chromium_conf[*]}" \
+ -v -s --no-clean \
2>&1 | tee $OUTPUT/gyp-${PRGNAM}.log
echo "-- Generating ninja build files."
out/Release/gn gen out/Release -v --args="${_chromium_conf[*]}" \
@@ -909,7 +891,7 @@ elif [ -f out/Release/lib/libffmpeg.so ]; then
fi
if [ -f out/Release/natives_blob.bin ]; then
cp -a \
- out/Release/{natives_blob.bin,snapshot_blob.bin} \
+ out/Release/{natives_blob.bin,snapshot_blob.bin,v8_context_snapshot.bin} \
$PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/
fi
if [ ${USE_NACL} -eq 1 ]; then