From 093e86075123491dbd4cc3eefb310039167caf28 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 23:09:33 +0300 Subject: [PATCH] Revert libc++experimental, was removed frome experimantal --- libreoffice.spec | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index ba03e37..435b839 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -103,8 +103,6 @@ BuildRequires: ccache BuildRequires: clang BuildRequires: clang-devel BuildRequires: libcxx-devel -# libc++experimental is static only -BuildRequires: libcxx-static-devel BuildRequires: libcxxabi-devel %endif BuildRequires: desktop-file-utils @@ -2942,13 +2940,6 @@ chmod 777 ~/tmp # 4.4.1.2 specific chmod +x bin/unpack-sources -%if %{with clang} -grep -IrlE 'include[[:blank:]]([[:blank:]])*' | xargs sed -i -E \ - -e 's,include[[:blank:]]([[:blank:]])*,include ,g' \ - -e 's,std::string_view,std::experimental::string_view,g' \ - -e 's,std::u16string_view,std::experimental::u16string_view,g' -%endif - %build # path to external tarballs 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 export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" %clang_gcc_wrapper -export LIBCCX_LIBS="-lc++ -lc++abi -lc++experimental" +export LIBCCX_LIBS="-lc++ -lc++abi" export CPPUNIT_LIBS="-lcppunit" install -m0755 %{SOURCE80} "local_bin/clang++wr" sed -i -e "s,/usr/bin/clang++,${PWD}/local_bin/clang++wr,g" "local_bin/clang++"