commit 7abe45ef20659a9277d79093f4e1d8d96194f779 Author: Tom Callaway <spot(a)fedoraproject.org&gt; Date: Tue Oct 24 22:25:28 2017 -0400 do not attempt to use std=c++14 on epel7 chromium-62.0.3202.62-epel7-noc++14.patch | 12 ++++++++++++ chromium.spec | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) --- diff --git a/chromium-62.0.3202.62-epel7-noc++14.patch b/chromium-62.0.3202.62-epel7-noc++14.patch new file mode 100644 index 0000000..57d24b0 --- /dev/null +++ b/chromium-62.0.3202.62-epel7-noc++14.patch @@ -0,0 +1,12 @@ +diff -up chromium-62.0.3202.62/tools/gn/bootstrap/bootstrap.py.epel7-noc++14 chromium-62.0.3202.62/tools/gn/bootstrap/bootstrap.py +--- chromium-62.0.3202.62/tools/gn/bootstrap/bootstrap.py.epel7-noc++14 2017-10-24 22:20:25.881183458 -0400 ++++ chromium-62.0.3202.62/tools/gn/bootstrap/bootstrap.py 2017-10-24 22:20:38.395943374 -0400 +@@ -349,7 +349,7 @@ def write_gn_ninja(path, root_gen_dir, o + '-pipe', + '-fno-exceptions' + ]) +- cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing']) ++ cflags_cc.extend(['-Wno-c++11-narrowing']) + if is_aix: + cflags.extend(['-maix64']) + ldflags.extend([ '-maix64 -Wl,-bbigtoc' ]) diff --git a/chromium.spec b/chromium.spec index f9ec65e..b5aec69 100644 --- a/chromium.spec +++ b/chromium.spec @@ -119,7 +119,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld} Name: chromium%{chromium_channel} %endif Version: %{majorversion}.0.3202.62 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: A WebKit (Blink) powered web browser Url: http://www.chromium.org/Home License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) @@ -216,6 +216,8 @@ Patch62: chromium-gcc5-r3.patch Patch63: chromium-gn-bootstrap-r17.patch # Fix _cplusplus conditional Patch64: chromium-62.0.3202.62-correct-cplusplus-check.patch +# epel7 does not know about c++14 +Patch65: chromium-62.0.3202.62-epel7-noc++14.patch ### Chromium Tests Patches ### Patch100: chromium-46.0.2490.86-use_system_opus.patch @@ -667,6 +669,7 @@ udev. %patch59 -p1 -b .gcc-nc %patch60 -p1 -b .nonullptr %patch61 -p1 -b .another-rvalue-fix +%patch65 -p1 -b .epel7-noc++14 %endif %patch50 -p1 -b .pathfix %patch53 -p1 -b .nogccoptmath @@ -806,6 +809,9 @@ CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false linux_use_bundled_bin %ifarch aarch64 CHROMIUM_CORE_GN_DEFINES+=' target_cpu="arm64"' %endif +%if 0%{?rhel} == 7 +CHROMIUM_CORE_GN_DEFINES+=' use_cxx11=true' +%endif export CHROMIUM_CORE_GN_DEFINES CHROMIUM_BROWSER_GN_DEFINES="" @@ -1902,6 +1908,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Tue Oct 24 2017 Tom Callaway <spot(a)fedoraproject.org&gt; 62.0.3202.62-1.1 +- do not attempt std=c++14 on epel7 + * Wed Oct 18 2017 Tom Callaway <spot(a)fedoraproject.org&gt; 62.0.3202.62-1 - update to 62.0.3202.62