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

Use libstdc++-gcc10 because of ABI incompatibility of libc++ and libstdc++

Browse source
This commit is contained in:
Mikhail Novosyolov 2020-04-04 01:17:14 +03:00
parent 7c24887628
commit 884293b547
1 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libreoffice.spec
View file

@ -48,9 +48,6 @@ Source1: %{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz
Source2: %{relurl}/%{ooname}-help-%{buildver}.tar.xz Source2: %{relurl}/%{ooname}-help-%{buildver}.tar.xz
Source3: %{relurl}/%{ooname}-translations-%{buildver}.tar.xz Source3: %{relurl}/%{ooname}-translations-%{buildver}.tar.xz
Source4: %{devexurl}/185d60944ea767075d27247c3162b3bc-unowinreg.dll Source4: %{devexurl}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
%if %{with clang}
Source5: http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz
%endif
# Unused, should be dropped in future package updates # Unused, should be dropped in future package updates
Source10: Mandriva-Rosa_Icons.tar.bz2 Source10: Mandriva-Rosa_Icons.tar.bz2
@ -101,9 +98,7 @@ BuildRequires: ccache
%endif %endif
%if %{with clang} %if %{with clang}
BuildRequires: clang BuildRequires: clang
BuildRequires: clang-devel BuildRequires: stdc++-gcc10-devel
BuildRequires: libcxx-devel
BuildRequires: libcxxabi-devel
%endif %endif
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: doxygen >= 1.8.4 BuildRequires: doxygen >= 1.8.4
@ -153,9 +148,7 @@ BuildRequires: unixODBC-devel
#BuildRequires: vigra-devel #BuildRequires: vigra-devel
BuildRequires: gpgmepp-devel BuildRequires: gpgmepp-devel
BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(bluez)
%if !%{with clang}
BuildRequires: pkgconfig(cppunit) >= 1.14.0 BuildRequires: pkgconfig(cppunit) >= 1.14.0
%endif
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(libetonyek-0.1) BuildRequires: pkgconfig(libetonyek-0.1)
@ -2958,19 +2951,11 @@ export CCACHE_DIR=%{ccachedir}
%setup_compile_flags %setup_compile_flags
%if %{with clang} %if %{with clang}
# libstdc++ from gcc5 is too old, use LLVM libc++ # libstdc++ from gcc5 is too old, use newer version of libstdc++
# https://libcxx.llvm.org/docs/UsingLibcxx.html export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libstdc++-gcc10 -I%{_includedir}/libstdc++-gcc10/%{_host}"
# clang -c -stdlib=libc++ -> export CXXFLAGS="$CXXFLAGS -nostdinc++ $CPPFLAGS -Wno-unused-command-line-argument"
# -> "argument unused during compilation: '-stdlib=libc++'" ->
# -> -Wno-unused-command-line-argument
export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -nostdinc++ -I/usr/include/c++/v1 -Wno-unused-command-line-argument"
export CPPFLAGS="$CPPFLAGS -I/usr/include/c++/v1"
# Workaround old system boost being incompatible with C++17 which removed std::auto_ptr
# https://github.com/TRIQS/triqs/issues/523#issuecomment-351960463
export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR"
%clang_gcc_wrapper %clang_gcc_wrapper
export LIBCCX_LIBS="-lc++ -lc++abi" export LIBCCX_LIBS="-lstdc++-gcc10"
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++"
%endif %endif
@ -3022,9 +3007,6 @@ sed -i \
--with-external-thes-dir=%{_datadir}/dict/ooo \ --with-external-thes-dir=%{_datadir}/dict/ooo \
--with-system-libs \ --with-system-libs \
--with-system-ucpp \ --with-system-ucpp \
%if %{with clang}
--without-system-cppunit \
%endif
--enable-ext-ct2n \ --enable-ext-ct2n \
--enable-ext-numbertext \ --enable-ext-numbertext \
--enable-ext-nlpsolver \ --enable-ext-nlpsolver \