From f01be3bf2e6d80a3bc4996762d8ed9bcce407851 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Wed, 1 Apr 2020 20:56:28 +0300 Subject: [PATCH] attach experimental parts of libc++ (TODO: probably we need to depends sctrictly from the version of libc++ against which we were built because experimental aBI is not stable) --- libreoffice.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 435b839..ddfbdf2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -103,6 +103,8 @@ 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 @@ -2940,6 +2942,11 @@ chmod 777 ~/tmp # 4.4.1.2 specific chmod +x bin/unpack-sources +%if %{with clang} +grep -Irl 'include ' | \ + sed -i -E -e 's,include[[:blank:]]([[:blank:]])*,include ,g' +%endif + %build # path to external tarballs EXTSRCDIR=`dirname %{SOURCE0}` @@ -2968,7 +2975,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" +export LIBCCX_LIBS="-lc++ -lc++abi -lc++experimental" 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++"