summaryrefslogtreecommitdiffstats
path: root/chromium-dev
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2014-08-27 22:04:24 +0000
committer Eric Hameleers <alien@slackware.com>2014-08-27 22:04:24 +0000
commite70c65bc2da11bec99b0dc74f368e8f9076dce53 (patch)
tree5849c1a8dabcffd24e44188b638ea3dfdbee0844 /chromium-dev
parentf5d4c13cfb1dce5a561985cf26bd0003d1b92968 (diff)
downloadasb-e70c65bc2da11bec99b0dc74f368e8f9076dce53.tar.gz
asb-e70c65bc2da11bec99b0dc74f368e8f9076dce53.tar.xz
Apply polishing from the chromium-37 build
Diffstat (limited to 'chromium-dev')
-rwxr-xr-xchromium-dev/build/chromium-dev.SlackBuild30
1 files changed, 20 insertions, 10 deletions
diff --git a/chromium-dev/build/chromium-dev.SlackBuild b/chromium-dev/build/chromium-dev.SlackBuild
index c18eac1e..e7f2f5fe 100755
--- a/chromium-dev/build/chromium-dev.SlackBuild
+++ b/chromium-dev/build/chromium-dev.SlackBuild
@@ -35,8 +35,8 @@
# - Internet access (for downloading the nacl/pnacl toolchain bins)
# Needs:
# Changelog:
-# 38.0.2125.8-1:
-# 25/aug/2014 by Eric Hameleers <alien@slackware.com>
+# 38.0.2125.24-1:
+# 27/aug/2014 by Eric Hameleers <alien@slackware.com>
# * First build of the development channel of chromium.
#
# Run 'sh chromium-dev.SlackBuild' to build a Slackware package.
@@ -47,7 +47,7 @@
PRGNAM=chromium-dev
SRCNAM=chromium
-VERSION=${VERSION:-38.0.2125.8}
+VERSION=${VERSION:-38.0.2125.24}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:" -j4 "}
TAG=${TAG:-alien}
@@ -267,21 +267,23 @@ _chromium_conf=(
-Dicu_use_data_file_flag=0
-Dlinux_sandbox_path=/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/chrome_sandbox
-Dlinux_strip_binary=1
+ -Dlinux_use_bundled_binutils=0
+ -Dlinux_use_bundled_gold=0
-Dlinux_use_gold_binary=0
-Dlinux_use_gold_flags=0
- -Dlinux_use_tcmalloc=0
-Dlogging_like_official_build=1
-Dproprietary_codecs=1
-Dremove_webcore_debug_symbols=1
-Dusb_ids_path=/usr/share/hwdata/usb.ids
+ -Duse_allocator=none
-Duse_gconf=0
-Duse_kerberos=0
-Duse_pulseaudio=0
-Duse_system_bzip2=1
-Duse_system_flac=1
-Duse_system_ffmpeg=0
- -Duse_system_harfbuzz=1
- -Duse_system_icu=1
+ -Duse_system_harfbuzz=0
+ -Duse_system_icu=0
-Duse_system_libevent=1
-Duse_system_libjpeg=0
-Duse_system_libpng=0
@@ -304,16 +306,24 @@ _chromium_conf=(
#-Dlinux_link_libpci=1
#-Dlinux_link_pulseaudio=0
-build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}" \
- 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-build/gyp_chromium --depth=. "${_chromium_conf[@]}" \
- 2>&1 | tee $OUTPUT/gyp-${PRGNAM}.log
+# Download the NaCL toolchains:
if [ ${USE_NACL} -eq 1 ]; then
# We do not need arm_trusted on x86:
build/download_nacl_toolchains.py --packages nacl_x86_newlib,pnacl_newlib,pnacl_translator \
2>&1 | tee $OUTPUT/nacl_dl-${PRGNAM}.log
fi
+# Do not make the build fail, see Chromium issue #386097:
+third_party/libaddressinput/chromium/tools/update-strings.py \
+ 2>&1 | tee $OUTPUT/update_strings-${PRGNAM}.log
+
+# Unbundle the libraries which we use from the system:
+build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}" \
+ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+# Generate the ninja build files:
+build/gyp_chromium --depth=. "${_chromium_conf[@]}" \
+ 2>&1 | tee $OUTPUT/gyp-${PRGNAM}.log
+# Compile everything:
ninja $NUMJOBS -C out/Release chrome chrome_sandbox chromedriver
2>&1 | tee $OUTPUT/ninja-${PRGNAM}.log