diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 9bcaee6..6af31bb 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -5,6 +5,7 @@ %define _src %{_topdir}/SOURCES %define chromium_system_libs 0 +%define clang 1 Summary: A fast web browser based on the Blink engine Name: chromium-browser-stable @@ -87,6 +88,10 @@ BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(zlib) +%if 0%{?clang} +BuildRequires: clang +%endif + Suggests: chromium-browser-pepper-flash Suggests: chromium-widevinecdm-plugin Conflicts: chromium-browser-beta @@ -212,7 +217,6 @@ buildconfig+="-Dwerror= -Dlinux_fpic=1 -Ddisable_sse2=1 -Dcomponent=shared_library - -Dclang=0 -Dtoolkit_uses_gtk=0 -Dffmpeg_branding=Chrome -Ddisable_nacl=1 @@ -224,6 +228,13 @@ buildconfig+="-Dwerror= -Duse_aura=1 -Denable_widevine=1" +%if 0%{?clang} +buildconfig+="-Dclang=1 + -Dclang_use_chrome_plugins=0" +%else +buildconfig+=" -Dclang=0" +%endif + %if 0%{?chromium_system_libs} buildconfig+=" -Duse_system_flac=1 -Duse_system_speex=1 @@ -279,6 +290,16 @@ buildconfig+=" -Duse_system_icu=0 -Dgoogle_default_client_id=4139804441.apps.googleusercontent.com -Dgoogle_default_client_secret=KDTRKEZk2jwT_7CDpcmMA--P" +%if 0%{?clang} +export CC=/usr/bin/clang +export CXX=/usr/bin/clang++ +# Modern Clang produces a *lot* of warnings +export CXXFLAGS="${CXXFLAGS} -Wno-unknown-warning-option -Wno-unused-local-typedef -Wunknown-attributes -Wno-tautological-undefined-compare" +export GYP_DEFINES="clang=1 enable_hidpi=1 enable_touch_ui=1 enable_hotwording=0" +%else +export GYP_DEFINES="enable_hidpi=1 enable_touch_ui=1 enable_hotwording=0" +%endif + build/linux/unbundle/replace_gyp_files.py $buildconfig export GYP_GENERATORS='ninja'