Djam/chromium-browser-stable-slava86
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable-slava86.git synced 2025-02-24 07:52:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix defining %{use_custom_libcxx_macro_tmpfile}

Browse source
This commit is contained in:
Mikhail Novosyolov 2018-10-17 16:00:27 +03:00
parent f6d2bc0cc9
commit b0e5c0946b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chromium-browser-stable.spec
View file

@ -360,13 +360,15 @@ glibc_version="$(rpm -q --queryformat "%{VERSION}" glibc | sed -e 's/\.//g')"
# glibc 2.27 is used as a stop point, because today (17.10.2018) Chromium
# is built with system glibc 2.27 in ALT Sisyphus,
# ROSA has glibc 2.25, and chromium 69 is unbuildable with it
%define use_custom_libcxx_macro_tmpfile %{buildroot}/use_custom_libcxx.tmp
if [ "$glibc_version" -lt 227 ]
then use_custom_libcxx='true'
else use_custom_libcxx='false'
fi
export use_custom_libcxx
echo "$use_custom_libcxx" > %{use_custom_libcxx_macro_tmpfile}
echo "DEBUG: use_custom_libcxx = ${use_custom_libcxx}"
%define use_custom_libcxx %(echo ${use_custom_libcxx})
%define use_custom_libcxx_macro %(cat %{use_custom_libcxx_macro_tmpfile})
rm -fv %{use_custom_libcxx_macro_tmpfile}
%build
%define use_gold true
@ -436,7 +438,7 @@ CXXFLAGS="$CXXFLAGS -Wno-error=attributes -Wno-error=comment -Wno-error=unused-v
# v NO TABS IN HERE!
%define gn_config use_sysroot=false \
system_libdir="%{_lib}" \
use_custom_libcxx="%{use_custom_libcxx}" \
use_custom_libcxx="%{use_custom_libcxx_macro}" \
icu_use_data_file=true \
enable_nacl=false \
optimize_webui=true \