Djam/libreoffice
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/libreoffice.git synced 2025-02-23 18:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert libc++experimental, <string_view> was removed frome experimantal

Browse source
This commit is contained in:
Mikhail Novosyolov 2020-04-01 23:09:33 +03:00
parent 7e4226a87f
commit 093e860751
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libreoffice.spec
View file

@ -103,8 +103,6 @@ BuildRequires: ccache
BuildRequires: clang BuildRequires: clang
BuildRequires: clang-devel BuildRequires: clang-devel
BuildRequires: libcxx-devel BuildRequires: libcxx-devel
# libc++experimental is static only
BuildRequires: libcxx-static-devel
BuildRequires: libcxxabi-devel BuildRequires: libcxxabi-devel
%endif %endif
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -2942,13 +2940,6 @@ chmod 777 ~/tmp
# 4.4.1.2 specific # 4.4.1.2 specific
chmod +x bin/unpack-sources chmod +x bin/unpack-sources
%if %{with clang}
grep -IrlE 'include[[:blank:]]([[:blank:]])*<string_view>' | xargs sed -i -E \
-e 's,include[[:blank:]]([[:blank:]])*<string_view>,include <experimental/string_view>,g' \
-e 's,std::string_view,std::experimental::string_view,g' \
-e 's,std::u16string_view,std::experimental::u16string_view,g'
%endif
%build %build
# path to external tarballs # path to external tarballs
EXTSRCDIR=`dirname %{SOURCE0}` EXTSRCDIR=`dirname %{SOURCE0}`
@ -2977,7 +2968,7 @@ export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -nostdinc++ -I/usr/include/c++/v1 -Wno
# https://github.com/TRIQS/triqs/issues/523#issuecomment-351960463 # https://github.com/TRIQS/triqs/issues/523#issuecomment-351960463
export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR"
%clang_gcc_wrapper %clang_gcc_wrapper
export LIBCCX_LIBS="-lc++ -lc++abi -lc++experimental" export LIBCCX_LIBS="-lc++ -lc++abi"
export CPPUNIT_LIBS="-lcppunit" export CPPUNIT_LIBS="-lcppunit"
install -m0755 %{SOURCE80} "local_bin/clang++wr" install -m0755 %{SOURCE80} "local_bin/clang++wr"
sed -i -e "s,/usr/bin/clang++,${PWD}/local_bin/clang++wr,g" "local_bin/clang++" sed -i -e "s,/usr/bin/clang++,${PWD}/local_bin/clang++wr,g" "local_bin/clang++"