Hello community,
here is the log from the commit of package chromium for openSUSE:Factory
checked in at 2017-03-16 09:41:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Thu Mar 16 09:41:28 2017 rev:150 rq:478469 version:57.0.2987.98
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2017-03-02
19:28:56.302937616 +0100
+++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2017-03-16
09:49:34.898390059 +0100
@@ -1,0 +2,18 @@
+Fri Mar 10 10:55:23 UTC 2017 - tchva...@suse.com
+
+- Version update to 57.0.2987.98 bsc#1028848:
+ CVE-2017-5030 CVE-2017-5031 CVE-2017-5032 CVE-2017-5029 CVE-2017-5034
+ CVE-2017-5035 CVE-2017-5036 CVE-2017-5037 CVE-2017-5039 CVE-2017-5040
+ CVE-2017-5041 CVE-2017-5033 CVE-2017-5042 CVE-2017-5038 CVE-2017-5043
+ CVE-2017-5044 CVE-2017-5045 CVE-2017-5046
+- Refresh patches
+ * fix-gn-bootstrap.diff
+ * chromium-linker-memory.patch
+- Remove obsolete patches:
+ * chromium-sandbox.patch
+ * chromium-54-ffmpeg2compat.patch
+- Remove vaapi patch which broke rendering on non-intel cards:
+ * chromium-enable-vaapi-on-suse.patch
+- From this release onwards i586 build is disabled
+
+-------------------------------------------------------------------
Old:
----
chromium-54-ffmpeg2compat.patch
chromium-56.0.2924.87.tar.xz
chromium-enable-vaapi-on-suse.patch
chromium-sandbox.patch
privacy_patches-oS_cr-56.0.2924.87.tar.gz
New:
----
chromium-57.0.2987.98.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.O50cvO/_old 2017-03-16 09:49:46.564737889 +0100
+++ /var/tmp/diff_new_pack.O50cvO/_new 2017-03-16 09:49:46.568737322 +0100
@@ -17,12 +17,6 @@
%define rname chromium
-%if %{?suse_version} != 1320
-# 1320 didn't contain ffmpeg YET
-%bcond_without system_ffmpeg
-%else
-%bcond_with system_ffmpeg
-%endif
%if %{?suse_version} <= 1320
%bcond_with system_vpx
%else
@@ -47,14 +41,8 @@
%bcond_with system_harfbuzz
%endif
%bcond_with clang
-# Allow building with less Chromium features which potentially implicate
privacy
-%bcond_with privacy
-%if %{without privacy}
Name: chromium
-%else
-Name: chromium-privacy
-%endif
-Version: 56.0.2924.87
+Version: 57.0.2987.98
Release: 0
Summary: Google's open source browser project
License: BSD-3-Clause and LGPL-2.1+
@@ -71,10 +59,6 @@
Source104: chromium-icons.tar.bz2
# PATCH-FEATURE-UPSTREAM
https://bugs.chromium.org/p/chromium/issues/detail?id=654190
Source105: chromium-browser.appdata.xml
-%if %{with privacy}
-# PATCH-FEATURE-OPENSUSE
https://github.com/u4qo60z73t1c4hurv3ny/privacy_patches-oS_cr/archive/%{version}/privacy_patches-oS_cr-%{version}.tar.gz
- Compilation of patches to reduce the privacy implications of multiple
Chromium services
-Source200:
https://github.com/u4qo60z73t1c4hurv3ny/privacy_patches-oS_cr/archive/%{version}/privacy_patches-oS_cr-%{version}.tar.gz
-%endif
# PATCH-FIX-OPENSUSE Make the 1-click-install ymp file always download
[bnc#836059]
Patch1: exclude_ymp.diff
# PATCH-FIX-OPENSUSE enables reading of the master preference
@@ -92,12 +76,8 @@
Patch9: chromium-system-jinja-r13.patch
# Gcc fix
Patch10: gcc60-fixes.diff
-# PATCH-FIX-UPSTREAM correctly build sandbox
-Patch12: chromium-sandbox.patch
# PATCH-FIX-SUSE make ld use less memory by tweaking compiler flags
Patch13: chromium-linker-memory.patch
-# PATCH-FIX-UPSTREAM use system ffmpeg even in 2.x series version
-Patch14: chromium-54-ffmpeg2compat.patch
# archlinux arm enhancement patches
Patch100: arm-webrtc-fix.patch
Patch101: arm_use_right_compiler.patch
@@ -106,9 +86,6 @@
Patch201: fix-gn-bootstrap.diff
# PATCH-FIX-SUSE: allow proprietary codecs to be set with chromium branding
Patch202: chromium-prop-codecs.patch
-# PATCH-FEATURE-OPENSUSE: chromium-56-enable-vaapi-on-suse.patch - Enable
VAAPI hardware accelerated video decoding.
-# See
https://github.com/saiarcot895/chromium-ubuntu-build/blob/master/debian/patches/enable_vaapi_on_linux.diff
-Patch300: chromium-enable-vaapi-on-suse.patch
BuildRequires: SDL-devel
BuildRequires: binutils-gold
BuildRequires: bison
@@ -217,7 +194,7 @@
# There is no v8 for ppc and thus chromium won't run on ppc. For aarch64
# certain buildrequires are missing (e.g. valgrind)
# while it would build for %arm, we exclude it as it takes forever to build
-ExcludeArch: %{arm} aarch64 ppc ppc64 ppc64le
+ExcludeArch: %{arm} aarch64 i586 ppc ppc64 ppc64le
%if !%{with sle_bundles}
BuildRequires: python-Jinja2
BuildRequires: python-beautifulsoup4
@@ -239,7 +216,6 @@
%if %{with system_vpx}
BuildRequires: pkgconfig(vpx) >= 1.4.0
%endif
-%if %{with system_ffmpeg}
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavfilter)
BuildRequires: pkgconfig(libavformat) >= 57.41.100
@@ -248,11 +224,6 @@
Obsoletes: chromium-ffmpeg
Obsoletes: chromium-ffmpegsumo
Provides: ffmpegsumo = %{version}
-%else
-Requires: ffmpegsumo
-# Recommends the chromium-ffmpeg library (available from packman)
-Recommends: %{name}-ffmpeg
-%endif
%if %{with clang}
BuildRequires: clang >= 3.9.0
%else
@@ -266,32 +237,10 @@
BuildRequires: gcc5-c++
%endif
%endif
-#Requirements to build a fully functional ffmpeg
-# This can only be done on packman OBS
-%if 0%{?packman_bs}
-BuildRequires: libfaac-devel >= 1.28
-BuildRequires: libmp3lame-devel
-BuildRequires: libopencore-amr-devel
-BuildRequires: libx264-devel
-BuildRequires: libxvidcore-devel
-%endif
%description
Chromium is the open-source project behind Google Chrome. We invite you to
join us in our effort to help build a safer, faster, and more stable way for
all Internet users to experience the web, and to create a powerful platform for
developing a new generation of web applications.
-%if !%{with system_ffmpeg}
-%package ffmpegsumo
-Summary: Library to provide partial ffmpeg support to Chromium
-License: BSD-3-Clause and LGPL-2.1+
-Group: Productivity/Networking/Web/Browsers
-Requires: %{name}
-Conflicts: otherproviders(ffmpegsumo)
-Provides: ffmpegsumo = %{version}
-
-%description ffmpegsumo
-The is the multimedia codec library for Chromium. It is based on the internal
ffmpeg source code and contains only the open source codecs from ffmpeg.
Proprietary codecs (e.g. H.264) are not part of this library, but are provided
in an external package
-%endif
-
%package -n chromedriver
Summary: WebDriver for Google Chrome/Chromium
License: BSD-3-Clause
@@ -302,19 +251,6 @@
%description -n chromedriver
WebDriver is an open source tool for automated testing of webapps across many
browsers. It provides capabilities for navigating to web pages, user input,
JavaScript execution, and more. ChromeDriver is a standalone server which
implements WebDriver's wire protocol for Chromium. It is being developed by
members of the Chromium and WebDriver teams.
-%if 0%{?packman_bs}
-%package ffmpeg
-Summary: The ffmpeg library for Google's opens source browser Chromium
-License: BSD-3-Clause and LGPL-2.1+
-Group: Productivity/Networking/Web/Browsers
-Requires: %{name}
-Conflicts: otherproviders(ffmpegsumo)
-Provides: ffmpegsumo = %{version}
-
-%description ffmpeg
-FFMPEG library built from the chromium sources.
-%endif
-
%prep
%setup -q -n %{rname}-%{version}
@@ -335,17 +271,12 @@
%patch9 -p1
%endif
%patch10
-%patch12 -p1
%patch13 -p1
-%patch14 -p1
# archlinux arm enhancements
%patch100
%patch101
-# VAAPI patch
-%patch300 -p1
-
# Copy the toolchain settings
mkdir toolchain
cp %{SOURCE1} toolchain/BUILD.gn
@@ -481,9 +412,6 @@
third_party/libvpx/source/libvpx/third_party/x86inc
)
%endif
-%if !%{with system_ffmpeg}
-keeplibs+=( third_party/ffmpeg )
-%endif
%if !%{with system_harfbuzz}
keeplibs+=( third_party/harfbuzz-ng )
%endif
@@ -498,14 +426,6 @@
)
build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove
-%if %{with privacy}
-%setup -q -T -D -a 200 -n %{rname}-%{version}
-for file in privacy_patches-oS_cr-%{version}/*.patch
-do
- patch -p1 < "$file"
-done
-%endif
-
%build
# this is as we do our own toolchain that we want to override for older distros
export CC=gcc
@@ -537,7 +457,8 @@
fi
# Set system libraries to be used
-gn_system_libraries="
+gn_system_libraries=(
+ ffmpeg
flac
libjpeg
libpng
@@ -546,26 +467,23 @@
libxslt
re2
snappy
-"
+)
%if !%{with sle_bundles}
-gn_system_libraries+=" yasm"
+gn_system_libraries+=( yasm )
%endif
%if %{with system_minizip}
-gn_system_libraries+=" zlib"
+gn_system_libraries+=( zlib )
%endif
%if %{with system_harfbuzz}
-gn_system_libraries+=" harfbuzz-ng"
+gn_system_libraries+=( harfbuzz-ng )
%endif
%if %{with system_icu}
-gn_system_libraries+=" icu"
+gn_system_libraries+=( icu )
%endif
%if %{with system_vpx}
-gn_system_libraries+=" libvpx"
-%endif
-%if %{with system_ffmpeg}
-gn_system_libraries+=" ffmpeg"
+gn_system_libraries+=( libvpx )
%endif
-build/linux/unbundle/replace_gn_files.py --system-libraries
${gn_system_libraries}
+build/linux/unbundle/replace_gn_files.py --system-libraries
${gn_system_libraries[@]}
# Create the configuration for GN
# Available options: out/Release/gn args --list out/Release/
@@ -585,39 +503,25 @@
myconf_gn+=" use_pulseaudio=true link_pulseaudio=true"
myconf_gn+=" is_component_build=false"
myconf_gn+=" use_sysroot=false"
-myconf_gn+=" treat_warnings_as_errors=false"
myconf_gn+=" fatal_linker_warnings=false"
myconf_gn+=" use_allocator=\"tcmalloc\""
myconf_gn+=" fieldtrial_testing_like_official_build=true"
myconf_gn+=" use_gold=true"
myconf_gn+=" use_sysroot=false"
+myconf_gn+=" treat_warnings_as_errors=false"
myconf_gn+=" enable_widevine=true"
-%if %{without privacy}
myconf_gn+=" enable_hangout_services_extension=true"
-%else
-myconf_gn+=" enable_hangout_services_extension=false"
-myconf_gn+=" enable_google_now=false"
-myconf_gn+=" enable_webrtc=false"
-myconf_gn+=" enable_remoting=false"
-myconf_gn+=" safe_browsing_mode=0"
-myconf_gn+=" enable_rlz=false enable_rlz_support=false"
-myconf_gn+=" enable_print_preview=false"
-myconf_gn+=" enable_hangout_services_extension=false"
-%endif
%if %{with clang}
myconf_gn+=" is_clang=true clang_base_path=\"/usr\"
clang_use_chrome_plugins=false"
%else
myconf_gn+=" is_clang=false"
%endif
-# Define the Chrome branding in order to get libffmpeg on packman that
supports all codecs
# The proprietary codecs just force the chromium to say they can use it and
-# offload the actual computation to the split ffmpeg.so, otherwise the chromium
+# offload the actual computation to the ffmpeg, otherwise the chromium
# won't be able to load the codec even if the library can handle it
myconf_gn+=" proprietary_codecs=true"
-%if 0%{?packman_bs} || %{with system_ffmpeg}
myconf_gn+=" ffmpeg_branding=\"Chrome\""
-%endif
%ifarch %{arm}
myconf_gn+=" target_cpu=\"arm\""
@@ -634,11 +538,9 @@
google_default_client_id="4139804441.apps.googleusercontent.com"
google_default_client_secret="KDTRKEZk2jwT_7CDpcmMA--P"
-%if %{without privacy}
myconf_gn+=" google_api_key=\"${google_api_key}\""
myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-%endif
third_party/libaddressinput/chromium/tools/update-strings.py
@@ -651,93 +553,77 @@
# https://bugs.chromium.org/p/chromium/issues/detail?id=642016
out/Release/gn gen --args="${myconf_gn}" out/Release
-%if 0%{?packman_bs}
- ninja -v -j $ninjaproc -C out/Release third_party/ffmpeg
-%else
- ninja -v -j $ninjaproc -C out/Release chrome chrome_sandbox chromedriver
-%endif
+ninja -v -j $ninjaproc -C out/Release chrome chrome_sandbox chromedriver
%install
mkdir -p %{buildroot}%{_libdir}/chromium
-%if 0%{?packman_bs}
- pushd out/Release
- cp -av libffmpeg.so %{buildroot}%{_libdir}/chromium/
- popd
-%else
- %ifarch x86_64
- mkdir -p %{buildroot}%{_libexecdir}/
- %endif
- mkdir -p %{buildroot}%{_bindir}
- install -m 755 %{SOURCE100} %{buildroot}%{_bindir}/chromium
-
- # x86_64 capable systems need this
- sed -i "s|%{_libexecdir}/chromium|%{_libdir}/chromium|g"
%{buildroot}%{_bindir}/chromium
+%ifarch x86_64
+mkdir -p %{buildroot}%{_libexecdir}/
+%endif
+mkdir -p %{buildroot}%{_bindir}
+install -m 755 %{SOURCE100} %{buildroot}%{_bindir}/chromium
- mkdir -p %{buildroot}%{_mandir}/man1/
- pushd out/Release
+# x86_64 capable systems need this
+sed -i "s|%{_libexecdir}/chromium|%{_libdir}/chromium|g"
%{buildroot}%{_bindir}/chromium
- # Install the file %{_sysconfdir}/default/chromium which defines the
chromium flags
- mkdir -p %{buildroot}%{_sysconfdir}/default
- install -m 644 %{SOURCE103} %{buildroot}%{_sysconfdir}/default/chromium
+mkdir -p %{buildroot}%{_mandir}/man1/
+pushd out/Release
- # Recent Chromium builds now wants to have the sandbox in the same
directory. So let's create a symlink to the one in %{_prefix}/lib
- cp -a chrome_sandbox %{buildroot}%{_libexecdir}/
- ln -s -f %{_libexecdir}/chrome_sandbox
%{buildroot}/%{_libdir}/chromium/chrome-sandbox
+# Install the file %{_sysconfdir}/default/chromium which defines the chromium
flags
+mkdir -p %{buildroot}%{_sysconfdir}/default
+install -m 644 %{SOURCE103} %{buildroot}%{_sysconfdir}/default/chromium
- cp -a *.bin *.pak locales xdg-mime %{buildroot}%{_libdir}/chromium/
- %if !%{with system_icu}
- cp -a icudtl.dat %{buildroot}%{_libdir}/chromium/
- %endif
+# Recent Chromium builds now wants to have the sandbox in the same directory.
So let's create a symlink to the one in %{_prefix}/lib
+cp -a chrome_sandbox %{buildroot}%{_libexecdir}/
+ln -s -f %{_libexecdir}/chrome_sandbox
%{buildroot}/%{_libdir}/chromium/chrome-sandbox
- # chromedriver
- cp -a chromedriver %{buildroot}%{_libdir}/chromium/
+cp -a *.bin *.pak locales xdg-mime %{buildroot}%{_libdir}/chromium/
+%if !%{with system_icu}
+cp -a icudtl.dat %{buildroot}%{_libdir}/chromium/
+%endif
- # ffmpeg
- %if !%{with system_ffmpeg}
- cp -a libffmpeg.so %{buildroot}%{_libdir}/chromium/
- %endif
+# chromedriver
+cp -a chromedriver %{buildroot}%{_libdir}/chromium/
- # Patch xdg-settings to use the chromium version of xdg-mime as that the
system one is not KDE4 compatible
- sed "s|xdg-mime|%{_libdir}/chromium/xdg-mime|g" xdg-settings >
%{buildroot}%{_libdir}/chromium/xdg-settings
+# Patch xdg-settings to use the chromium version of xdg-mime as that the
system one is not KDE4 compatible
+sed "s|xdg-mime|%{_libdir}/chromium/xdg-mime|g" xdg-settings >
%{buildroot}%{_libdir}/chromium/xdg-settings
- cp -a resources.pak %{buildroot}%{_libdir}/chromium/
- cp -a chrome %{buildroot}%{_libdir}/chromium/chromium
- cp -a chrome.1 %{buildroot}%{_mandir}/man1/chrome.1
- cp -a chrome.1 %{buildroot}%{_mandir}/man1/chromium.1
- %fdupes %{buildroot}%{_mandir}/man1/
+cp -a resources.pak %{buildroot}%{_libdir}/chromium/
+cp -a chrome %{buildroot}%{_libdir}/chromium/chromium
+cp -a chrome.1 %{buildroot}%{_mandir}/man1/chrome.1
+cp -a chrome.1 %{buildroot}%{_mandir}/man1/chromium.1
+%fdupes %{buildroot}%{_mandir}/man1/
- popd
+popd
- mkdir -p %{buildroot}%{_datadir}/icons/
- pushd %{buildroot}%{_datadir}/icons/
- tar -xjf %{SOURCE104}
- mv oxygen hicolor
- popd
+mkdir -p %{buildroot}%{_datadir}/icons/
+pushd %{buildroot}%{_datadir}/icons/
+tar -xjf %{SOURCE104}
+mv oxygen hicolor
+popd
- mkdir -p %{buildroot}%{_datadir}/applications/
- desktop-file-install --dir %{buildroot}%{_datadir}/applications
%{SOURCE101}
+mkdir -p %{buildroot}%{_datadir}/applications/
+desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE101}
- mkdir -p %{buildroot}%{_datadir}/appdata/
- cp -a %{SOURCE105} %{buildroot}%{_datadir}/appdata/
+mkdir -p %{buildroot}%{_datadir}/appdata/
+cp -a %{SOURCE105} %{buildroot}%{_datadir}/appdata/
- mkdir -p %{buildroot}%{_datadir}/gnome-control-center/default-apps/
- cp -a %{SOURCE102}
%{buildroot}%{_datadir}/gnome-control-center/default-apps/
+mkdir -p %{buildroot}%{_datadir}/gnome-control-center/default-apps/
+cp -a %{SOURCE102} %{buildroot}%{_datadir}/gnome-control-center/default-apps/
- # link to browser plugin path. Plugin patch doesn't work. Why?
- mkdir -p %{buildroot}%{_libdir}/browser-plugins
- pushd %{buildroot}%{_libdir}/chromium
- ln -s ../browser-plugins plugins
+# link to browser plugin path. Plugin patch doesn't work. Why?
+mkdir -p %{buildroot}%{_libdir}/browser-plugins
+pushd %{buildroot}%{_libdir}/chromium
+ln -s ../browser-plugins plugins
- # Install the master_preferences file
- mkdir -p %{buildroot}%{_sysconfdir}/chromium
- install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/chromium
+# Install the master_preferences file
+mkdir -p %{buildroot}%{_sysconfdir}/chromium
+install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/chromium
- # Set the right attributes
- chmod 755 %{buildroot}%{_libdir}/chromium/xdg-settings
- chmod 755 %{buildroot}%{_libdir}/chromium/xdg-mime
-%endif
+# Set the right attributes
+chmod 755 %{buildroot}%{_libdir}/chromium/xdg-settings
+chmod 755 %{buildroot}%{_libdir}/chromium/xdg-mime
-%if !0%{?packman_bs}
%verifyscript
%verify_permissions -e %{_libexecdir}/chrome_sandbox
@@ -751,23 +637,7 @@
%icon_theme_cache_postun
%desktop_database_postun
/sbin/ldconfig %{_libdir}/chromium
-%endif
-
-# Files!
-
-%if 0%{?packman_bs}
-%post ffmpeg
-/sbin/ldconfig %{_libdir}/chromium
-
-%postun ffmpeg
-/sbin/ldconfig %{_libdir}/chromium
-
-%files ffmpeg
-%defattr(-,root,root,-)
-%dir %{_libdir}/chromium
-%{_libdir}/chromium/libffmpeg.so
-%else
%files
%defattr(-,root,root,-)
%verify(not mode) %{_libexecdir}/chrome_sandbox
@@ -784,21 +654,11 @@
%{_datadir}/gnome-control-center/default-apps/chromium-browser.xml
%{_datadir}/icons/hicolor/
%{_libexecdir}/chrome_sandbox
-%if !%{with system_ffmpeg}
-%exclude %{_libdir}/chromium/libffmpeg.so
-%endif
%exclude %{_libdir}/chromium/chromedriver
%{_bindir}/chromium
-%if !%{with system_ffmpeg}
-%files ffmpegsumo
-%defattr(-,root,root,-)
-%{_libdir}/chromium/libffmpeg.so
-%endif
-
%files -n chromedriver
%defattr(-,root,root,-)
%{_libdir}/chromium/chromedriver
-%endif
%changelog
++++++ chromium-56.0.2924.87.tar.xz -> chromium-57.0.2987.98.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium-56.0.2924.87.tar.xz
/work/SRC/openSUSE:Factory/.chromium.new/chromium-57.0.2987.98.tar.xz differ:
char 27, line 1
++++++ chromium-linker-memory.patch ++++++
--- /var/tmp/diff_new_pack.O50cvO/_old 2017-03-16 09:49:46.692719764 +0100
+++ /var/tmp/diff_new_pack.O50cvO/_new 2017-03-16 09:49:46.692719764 +0100
@@ -1,8 +1,8 @@
-Index: chromium-56.0.2897.0/build/config/compiler/BUILD.gn
+Index: chromium-57.0.2946.0/build/config/compiler/BUILD.gn
===================================================================
---- chromium-56.0.2897.0.orig/build/config/compiler/BUILD.gn
-+++ chromium-56.0.2897.0/build/config/compiler/BUILD.gn
-@@ -346,7 +346,7 @@ config("compiler") {
+--- chromium-57.0.2946.0.orig/build/config/compiler/BUILD.gn
++++ chromium-57.0.2946.0/build/config/compiler/BUILD.gn
+@@ -343,7 +343,7 @@ config("compiler") {
# Only apply this to the target linker, since the host
# linker might not be gold, but isn't used much anyway.
"-Wl,--threads",
@@ -11,7 +11,7 @@
]
}
}
-@@ -367,22 +367,6 @@ config("compiler") {
+@@ -364,25 +364,6 @@ config("compiler") {
ldflags += [ "-fuse-ld=bfd" ]
}
@@ -23,10 +23,13 @@
- # Additionally, on cast Android x86, --icf=all causes issues.
- if (is_android && current_cpu == "x86") {
- ldflags += [ "-Wl,--icf=none" ]
-- } else if (is_clang || is_chromeos ||
+- } else if ((is_clang && !is_android) || is_chromeos ||
- (current_cpu != "x86" && current_cpu != "x64")) {
+- # TODO(thakis): Remove `!is_android` above once our gold has been rolled
+- # with the fix for https://sourceware.org/bugzilla/show_bug.cgi?id=17704
+- # merged. See also https://crbug.com/663886
- ldflags += [ "-Wl,--icf=all" ]
-- } else if (!is_android) {
+- } else if (!is_android || is_clang) {
- ldflags += [ "-Wl,--icf=safe" ]
- }
- }
@@ -34,7 +37,7 @@
if (linux_use_bundled_binutils) {
cflags += [ "-B$binutils_path" ]
}
-@@ -1290,11 +1274,6 @@ if (is_win) {
+@@ -1318,11 +1299,6 @@ if (is_win) {
# Don't emit the GCC version ident directives, they just end up in the
# .comment section taking up binary size.
"-fno-ident",
++++++ fix-gn-bootstrap.diff ++++++
--- /var/tmp/diff_new_pack.O50cvO/_old 2017-03-16 09:49:46.740712967 +0100
+++ /var/tmp/diff_new_pack.O50cvO/_new 2017-03-16 09:49:46.740712967 +0100
@@ -0,0 +1,13 @@
+Index: chromium-57.0.2970.0/tools/gn/err.cc
+===================================================================
+--- chromium-57.0.2970.0.orig/tools/gn/err.cc
++++ chromium-57.0.2970.0/tools/gn/err.cc
+@@ -158,8 +158,6 @@ void Err::AppendSubErr(const Err& err) {
+ }
+
+ void Err::InternalPrintToStdout(bool is_sub_err) const {
+- DCHECK(has_error_);
+-
+ if (!is_sub_err)
+ OutputString("ERROR ", DECORATION_RED);
+
