From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 50F3959CA7 for ; Fri, 25 Mar 2016 21:29:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B75C721C008; Fri, 25 Mar 2016 21:29:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4593821C008 for ; Fri, 25 Mar 2016 21:29:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BAAD1340D31 for ; Fri, 25 Mar 2016 21:29:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EA85859 for ; Fri, 25 Mar 2016 21:29:17 +0000 (UTC) From: "Paweł Hajdan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Paweł Hajdan" Message-ID: <1458941323.c94bd495ffb08ce97b33c9a491388860f3d2d879.phajdan.jr@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/Manifest www-client/chromium/chromium-51.0.2687.0.ebuild www-client/chromium/files/chromium-gn-r0.patch X-VCS-Directories: www-client/chromium/files/ www-client/chromium/ X-VCS-Committer: phajdan.jr X-VCS-Committer-Name: Paweł Hajdan X-VCS-Revision: c94bd495ffb08ce97b33c9a491388860f3d2d879 X-VCS-Branch: master Date: Fri, 25 Mar 2016 21:29:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 35d902a9-d3c4-45b8-adf5-cd751645951a X-Archives-Hash: 4bb45bf8a8a7fa4065e3eef42a099fe9 commit: c94bd495ffb08ce97b33c9a491388860f3d2d879 Author: Pawel Hajdan, Jr gentoo org> AuthorDate: Fri Mar 25 21:28:43 2016 +0000 Commit: Paweł Hajdan gentoo org> CommitDate: Fri Mar 25 21:28:43 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c94bd495 www-client/chromium: dev channel bump (51.0.2687.0) Package-Manager: portage-2.2.26 www-client/chromium/Manifest | 1 + www-client/chromium/chromium-51.0.2687.0.ebuild | 697 ++++++++++++++++++++++++ www-client/chromium/files/chromium-gn-r0.patch | 93 ++++ 3 files changed, 791 insertions(+) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index ec81cfe..0c13158 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,2 +1,3 @@ DIST chromium-49.0.2623.108.tar.xz 520440328 SHA256 da083a2bf17ff4c9b09b7451a81dfb41ece6b50ad363df20e918909e8cbcb1c0 SHA512 4b52bad489c21f20598c2770a4240e07e57fc127492eea6d7401214d3dbc74fdc68a8f20bbcff5c12ff5ff51cb0e76e2585ed590c2ca14fac7b99f4dd9281ee3 WHIRLPOOL cd7ec9002e1c1bd794fd1448294bd7aedd9bfe83839f4270046edab7c66d11c0d9f3223aabdc33870831592c939aff4d7fc1e73608d4cc21709f1cd523f34728 DIST chromium-50.0.2661.37.tar.xz 462477912 SHA256 e67a0e083a446ab57cabe8c7d8e1047aac128ee1aecaddc3d9f801b178a7be39 SHA512 e620d005a1ce2bfd0f3fe940914ac4e117feadbc8a569fa6e32be2593d540dc350c1282675a9f8cb07402a5393203eed77894531f3a9fe2cf16cbb8f70c124d3 WHIRLPOOL 97b66dbfa1824f45a038f761aa1d41852c174853b80bc8c297497ac4d549e46d84b6eb1f6732615c258f14c12aa3b02f3826bebcf2afceca27d8e04f1b311cf8 +DIST chromium-51.0.2687.0.tar.xz 462664524 SHA256 2453e8c43cec937e8ec38e69714a2a18827fffbd4646c62e50f64d99fb9d32f0 SHA512 518d22e5171bc668775356878b4d949ad9e531b329b06ea29f3c909865671da55ec809c058d262e9ece23fa0def805f02d893aba80e487259722a837315e99e2 WHIRLPOOL 98cb82f412c562c16b942000fb44102356bc74bfcc7917ce33db2839caddc5d69998c6e6307c4f35bc30c95ed7e6970a2500e86e1dc34da13ccfcb0656232452 diff --git a/www-client/chromium/chromium-51.0.2687.0.ebuild b/www-client/chromium/chromium-51.0.2687.0.ebuild new file mode 100644 index 0000000..c86d313 --- /dev/null +++ b/www-client/chromium/chromium-51.0.2687.0.ebuild @@ -0,0 +1,697 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +PYTHON_COMPAT=( python2_7 ) + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr + sv sw ta te th tr uk vi zh_CN zh_TW" + +inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \ + portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://chromium.org/" +SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" + +LICENSE="BSD hotwording? ( no-source-code )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" +RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" + +# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox. +REQUIRED_USE="gn? ( kerberos !system-ffmpeg !tcmalloc )" + +# Native Client binaries are compiled with different set of flags, bug #452066. +QA_FLAGS_IGNORED=".*\.nexe" + +# Native Client binaries may be stripped by the build system, which uses the +# right tools for it, bug #469144 . +QA_PRESTRIPPED=".*\.nexe" + +RDEPEND=" + app-arch/bzip2:= + cups? ( >=net-print/cups-1.3.11:= ) + >=dev-libs/elfutils-0.149 + dev-libs/expat:= + dev-libs/glib:= + >=dev-libs/jsoncpp-0.5.0-r1:= + dev-libs/nspr:= + >=dev-libs/nss-3.14.3:= + gnome? ( >=gnome-base/gconf-2.24.0:= ) + gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) + >=media-libs/alsa-lib-1.0.19:= + media-libs/fontconfig:= + media-libs/freetype:= + media-libs/libexif:= + media-libs/speex:= + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) + sys-apps/dbus:= + sys-apps/pciutils:= + >=sys-libs/libcap-2.22:= + virtual/udev + x11-libs/cairo:= + x11-libs/gdk-pixbuf:= + gtk3? ( x11-libs/gtk+:3= ) + !gtk3? ( x11-libs/gtk+:2= ) + x11-libs/libdrm + x11-libs/libX11:= + x11-libs/libXcomposite:= + x11-libs/libXcursor:= + x11-libs/libXdamage:= + x11-libs/libXext:= + x11-libs/libXfixes:= + >=x11-libs/libXi-1.6.0:= + x11-libs/libXinerama:= + x11-libs/libXrandr:= + x11-libs/libXrender:= + x11-libs/libXScrnSaver:= + x11-libs/libXtst:= + x11-libs/pango:= + kerberos? ( virtual/krb5 ) + !gn? ( + >=app-accessibility/speech-dispatcher-0.8:= + app-arch/snappy:= + >=dev-libs/libevent-1.4.13:= + dev-libs/libxml2:=[icu] + dev-libs/libxslt:= + media-libs/flac:= + >=media-libs/harfbuzz-0.9.41:=[icu(+)] + >=media-libs/libjpeg-turbo-1.2.0-r1:= + >=media-libs/libwebp-0.4.0:= + sys-libs/zlib:=[minizip] + )" +DEPEND="${RDEPEND} + !arm? ( + dev-lang/yasm + ) + dev-lang/perl + dev-perl/JSON + >=dev-util/gperf-3.0.3 + dev-util/ninja + sys-apps/hwids[usb(+)] + >=sys-devel/bison-2.4.3 + sys-devel/flex + virtual/pkgconfig" + +# For nvidia-drivers blocker, see bug #413637 . +RDEPEND+=" + !=www-client/chromium-9999 + ! "${T}/flapper_version.h" || die + myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h" + + # Use system-provided libraries. + # TODO: use_system_hunspell (upstream changes needed). + # TODO: use_system_icu (bug #576370). + # TODO: use_system_libpng (bug #578212). + # TODO: use_system_libsrtp (bug #459932). + # TODO: use_system_libusb (http://crbug.com/266149). + # TODO: use_system_libvpx (http://crbug.com/494939). + # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). + # TODO: use_system_protobuf (bug #525560). + # TODO: use_system_re2 (bug #571156). + # TODO: use_system_ssl (http://crbug.com/58087). + # TODO: use_system_sqlite (http://crbug.com/22208). + myconf_gyp+=" + -Duse_system_bzip2=1 + -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0) + -Duse_system_flac=1 + -Duse_system_harfbuzz=1 + -Duse_system_jsoncpp=1 + -Duse_system_libevent=1 + -Duse_system_libjpeg=1 + -Duse_system_libwebp=1 + -Duse_system_libxml=1 + -Duse_system_libxslt=1 + -Duse_system_minizip=1 + -Duse_system_nspr=1 + -Duse_system_snappy=1 + -Duse_system_speex=1 + -Duse_system_xdg_utils=1 + -Duse_system_zlib=1" + + # Needed for system icu - we don't need additional data files. + # myconf_gyp+=" -Dicu_use_data_file_flag=0" + + # TODO: patch gyp so that this arm conditional is not needed. + if ! use arm; then + myconf_gyp+=" + -Duse_system_yasm=1" + fi + + # Optional dependencies. + # TODO: linux_link_kerberos, bug #381289. + myconf_gyp+=" + $(gyp_use cups) + $(gyp_use gnome use_gconf) + $(gyp_use gnome-keyring use_gnome_keyring) + $(gyp_use gnome-keyring linux_link_gnome_keyring) + $(gyp_use gtk3) + $(gyp_use hangouts enable_hangout_services_extension) + $(gyp_use hidpi enable_hidpi) + $(gyp_use hotwording enable_hotwording) + $(gyp_use kerberos) + $(gyp_use pulseaudio) + $(gyp_use tcmalloc use_allocator tcmalloc none) + $(gyp_use widevine enable_widevine)" + + myconf_gn+=" use_cups=$(usex cups true false)" + myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" + + # Use explicit library dependencies instead of dlopen. + # This makes breakages easier to detect by revdep-rebuild. + myconf_gyp+=" + -Dlinux_link_gsettings=1 + -Dlinux_link_libpci=1 + -Dlinux_link_libspeechd=1 + -Dlibspeechd_h_prefix=speech-dispatcher/" + + # TODO: use the file at run time instead of effectively compiling it in. + myconf_gyp+=" + -Dusb_ids_path=/usr/share/misc/usb.ids" + + # Save space by removing DLOG and DCHECK messages (about 6% reduction). + myconf_gyp+=" + -Dlogging_like_official_build=1" + + if [[ $(tc-getCC) == *clang* ]]; then + myconf_gyp+=" -Dclang=1" + myconf_gn+=" is_clang=true" + else + myconf_gyp+=" -Dclang=0" + myconf_gn+=" is_clang=false" + fi + + # Never use bundled gold binary. Disable gold linker flags for now. + # Do not use bundled clang. + myconf_gyp+=" + -Dclang_use_chrome_plugins=0 + -Dhost_clang=0 + -Dlinux_use_bundled_binutils=0 + -Dlinux_use_bundled_gold=0 + -Dlinux_use_gold_flags=0 + -Dsysroot=" + myconf_gn+=" use_sysroot=false" + + ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" + myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}" + + # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . + # Note: these are for Gentoo use ONLY. For your own distribution, + # please get your own set of keys. Feel free to contact chromium@gentoo.org + # for more info. + myconf_gyp+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc + -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com + -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" + + local myarch="$(tc-arch)" + if [[ $myarch = amd64 ]] ; then + target_arch=x64 + ffmpeg_target_arch=x64 + elif [[ $myarch = x86 ]] ; then + target_arch=ia32 + ffmpeg_target_arch=ia32 + elif [[ $myarch = arm64 ]] ; then + target_arch=arm64 + ffmpeg_target_arch=arm64 + elif [[ $myarch = arm ]] ; then + target_arch=arm + ffmpeg_target_arch=$(usex neon arm-neon arm) + # TODO: re-enable NaCl (NativeClient). + local CTARGET=${CTARGET:-${CHOST}} + if [[ $(tc-is-softfloat) == "no" ]]; then + + myconf_gyp+=" -Darm_float_abi=hard" + fi + filter-flags "-mfpu=*" + use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" + + if [[ ${CTARGET} == armv[78]* ]]; then + myconf_gyp+=" -Darmv7=1" + else + myconf_gyp+=" -Darmv7=0" + fi + myconf_gyp+=" -Dsysroot= + $(gyp_use neon arm_neon) + -Ddisable_nacl=1" + else + die "Failed to determine target arch, got '$myarch'." + fi + + myconf_gyp+=" -Dtarget_arch=${target_arch}" + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + myconf_gyp+=" -Dwerror=" + myconf_gn+=" treat_warnings_as_errors=false" + + # Disable fatal linker warnings, bug 506268. + myconf_gyp+=" -Ddisable_fatal_linker_warnings=1" + + # Avoid CFLAGS problems, bug #352457, bug #390147. + if ! use custom-cflags; then + replace-flags "-Os" "-O2" + strip-flags + + # Prevent linker from running out of address space, bug #471810 . + if use x86; then + filter-flags "-g*" + fi + + # Prevent libvpx build failures. Bug 530248, 544702, 546984. + if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then + filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 + fi + fi + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX NM + + # Tools for building programs to be executed on the build system, bug #410883. + if tc-is-cross-compiler; then + export AR_host=$(tc-getBUILD_AR) + export CC_host=$(tc-getBUILD_CC) + export CXX_host=$(tc-getBUILD_CXX) + export NM_host=$(tc-getBUILD_NM) + fi + + # Bug 491582. + export TMPDIR="${WORKDIR}/temp" + mkdir -p -m 755 "${TMPDIR}" || die + + # TODO: also do this for GN bundled ffmpeg build. + if ! use system-ffmpeg && ! use gn; then + local build_ffmpeg_args="" + if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then + build_ffmpeg_args+=" --disable-asm" + fi + + # Re-configure bundled ffmpeg. See bug #491378 for example reasons. + einfo "Configuring bundled ffmpeg..." + pushd third_party/ffmpeg > /dev/null || die + chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ + --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die + chromium/scripts/copy_config.sh || die + chromium/scripts/generate_gyp.py || die + popd > /dev/null || die + fi + + third_party/libaddressinput/chromium/tools/update-strings.py || die + + touch chrome/test/data/webui/i18n_process_css_test.html || die + + einfo "Configuring Chromium..." + if use gn; then + tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die + out/Release/gn gen --args="${myconf_gn}" out/Release || die + else + build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die + egyp_chromium ${myconf_gyp} || die + fi +} + +eninja() { + if [[ -z ${NINJAOPTS+set} ]]; then + local jobs=$(makeopts_jobs) + local loadavg=$(makeopts_loadavg) + + if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then + NINJAOPTS+=" -j ${jobs}" + fi + if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then + NINJAOPTS+=" -l ${loadavg}" + fi + fi + set -- ninja -v ${NINJAOPTS} "$@" + echo "$@" + "$@" +} + +src_compile() { + local ninja_targets="chrome chrome_sandbox chromedriver" + + if ! use gn; then + # Build mksnapshot and pax-mark it. + eninja -C out/Release mksnapshot || die + pax-mark m out/Release/mksnapshot + fi + + # Even though ninja autodetects number of CPUs, we respect + # user's options, for debugging with -j 1 or any other reason. + eninja -C out/Release ${ninja_targets} || die + + pax-mark m out/Release/chrome +} + +src_install() { + exeinto "${CHROMIUM_HOME}" + doexe out/Release/chrome || die + + newexe out/Release/chrome_sandbox chrome-sandbox || die + fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + + doexe out/Release/chromedriver || die + use widevine && doexe out/Release/libwidevinecdmadapter.so + + # if ! use arm; then + # doexe out/Release/nacl_helper{,_bootstrap} || die + # insinto "${CHROMIUM_HOME}" + # doins out/Release/nacl_irt_*.nexe || die + # doins out/Release/libppGoogleNaClPluginChrome.so || die + # fi + + local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) + if [[ -n ${CHROMIUM_SUFFIX} ]]; then + sedargs+=( + -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" + -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" + -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" + ) + fi + sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die + doexe chromium-launcher.sh + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die + # keep the old symlink around for consistency + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die + + dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die + + # Allow users to override command-line options, bug #357629. + dodir /etc/chromium || die + insinto /etc/chromium + newins "${FILESDIR}/chromium.default" "default" || die + + pushd out/Release/locales > /dev/null || die + chromium_remove_language_paks + popd + + insinto "${CHROMIUM_HOME}" + doins out/Release/*.bin || die + doins out/Release/*.pak || die + + doins out/Release/icudtl.dat || die + + doins -r out/Release/locales || die + doins -r out/Release/resources || die + + newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die + newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die + + # Install icons and desktop entry. + local branding size + for size in 16 22 24 32 48 64 128 256 ; do + case ${size} in + 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; + *) branding="chrome/app/theme/chromium" ;; + esac + newicon -s ${size} "${branding}/product_logo_${size}.png" \ + chromium-browser${CHROMIUM_SUFFIX}.png + done + + local mime_types="text/html;text/xml;application/xhtml+xml;" + mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 + mime_types+="x-scheme-handler/ftp;" # bug #412185 + mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 + make_desktop_entry \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Chromium${CHROMIUM_SUFFIX}" \ + chromium-browser${CHROMIUM_SUFFIX} \ + "Network;WebBrowser" \ + "MimeType=${mime_types}\nStartupWMClass=chromium-browser" + sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die + + # Install GNOME default application entry (bug #303100). + if use gnome; then + dodir /usr/share/gnome-control-center/default-apps || die + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die + if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then + sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ + "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml + fi + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update + readme.gentoo_print_elog +} diff --git a/www-client/chromium/files/chromium-gn-r0.patch b/www-client/chromium/files/chromium-gn-r0.patch new file mode 100644 index 0000000..4ccfb93 --- /dev/null +++ b/www-client/chromium/files/chromium-gn-r0.patch @@ -0,0 +1,93 @@ +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index ac8adc8..f198833 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -118,6 +118,19 @@ def build_gn_with_ninja_manually(tempdir, options): + root_gen_dir = os.path.join(tempdir, 'gen') + mkdir_p(root_gen_dir) + ++ if is_linux: ++ mkdir_p(os.path.join(root_gen_dir, 'base', 'allocator')) ++ with tempfile.NamedTemporaryFile() as f: ++ f.write('--flags USE_EXPERIMENTAL_ALLOCATOR_SHIM=true') ++ f.flush() ++ ++ check_call([ ++ os.path.join(SRC_ROOT, 'build', 'write_buildflag_header.py'), ++ '--output', 'base/allocator/features.h', ++ '--gen-dir', root_gen_dir, ++ '--definitions', f.name, ++ ]) ++ + if is_mac: + # //base/build_time.cc needs base/generated_build_date.h, + # and this file is only included for Mac builds. +@@ -155,13 +168,18 @@ def write_ninja(path, root_gen_dir, options): + else: + cflags.extend(['-O2', '-g0']) + +- cflags.extend(['-D_FILE_OFFSET_BITS=64', '-pthread', '-pipe']) ++ cflags.extend([ ++ '-D_FILE_OFFSET_BITS=64', ++ '-pthread', ++ '-pipe', ++ '-fno-exceptions' ++ ]) + cflags_cc.extend(['-std=c++11', '-Wno-c++11-narrowing']) + + static_libraries = { +- 'base': {'sources': [], 'tool': 'cxx'}, +- 'dynamic_annotations': {'sources': [], 'tool': 'cc'}, +- 'gn': {'sources': [], 'tool': 'cxx'}, ++ 'base': {'sources': [], 'tool': 'cxx', 'include_dirs': []}, ++ 'dynamic_annotations': {'sources': [], 'tool': 'cc', 'include_dirs': []}, ++ 'gn': {'sources': [], 'tool': 'cxx', 'include_dirs': []}, + } + + for name in os.listdir(GN_ROOT): +@@ -181,6 +199,7 @@ def write_ninja(path, root_gen_dir, options): + ]) + static_libraries['base']['sources'].extend([ + 'base/allocator/allocator_extension.cc', ++ 'base/allocator/allocator_shim.cc', + 'base/at_exit.cc', + 'base/base_paths.cc', + 'base/base_switches.cc', +@@ -220,10 +239,11 @@ def write_ninja(path, root_gen_dir, options): + 'base/metrics/bucket_ranges.cc', + 'base/metrics/histogram.cc', + 'base/metrics/histogram_base.cc', +- 'base/metrics/histogram_persistence.cc', + 'base/metrics/histogram_samples.cc', + 'base/metrics/metrics_hashes.cc', ++ 'base/metrics/persistent_histogram_allocator.cc', + 'base/metrics/persistent_memory_allocator.cc', ++ 'base/metrics/persistent_sample_map.cc', + 'base/metrics/sample_map.cc', + 'base/metrics/sample_vector.cc', + 'base/metrics/sparse_histogram.cc', +@@ -276,6 +296,8 @@ def write_ninja(path, root_gen_dir, options): + 'base/timer/timer.cc', + 'base/trace_event/heap_profiler_allocation_context.cc', + 'base/trace_event/heap_profiler_allocation_context_tracker.cc', ++ 'base/trace_event/heap_profiler_allocation_register.cc', ++ 'base/trace_event/heap_profiler_heap_dump_writer.cc', + 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', + 'base/trace_event/heap_profiler_type_name_deduplicator.cc', + 'base/trace_event/memory_allocator_dump.cc', +@@ -328,6 +350,7 @@ def write_ninja(path, root_gen_dir, options): + 'base/threading/thread_local_storage_posix.cc', + 'base/threading/worker_pool_posix.cc', + 'base/time/time_posix.cc', ++ 'base/trace_event/heap_profiler_allocation_register_posix.cc', + ]) + static_libraries['libevent'] = { + 'sources': [ +@@ -362,6 +385,7 @@ def write_ninja(path, root_gen_dir, options): + 'tool': 'cxx', + } + static_libraries['base']['sources'].extend([ ++ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', + 'base/memory/shared_memory_posix.cc', + 'base/nix/xdg_util.cc', + 'base/process/internal_linux.cc',