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

Delete not existing variables and probably odd tuning of gcc flags

Browse source
This commit is contained in:
Mikhail Novosyolov 2020-04-01 05:23:43 +03:00
parent 38549dfff0
commit 37be0024da
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libreoffice.spec
View file

@ -2975,15 +2975,6 @@ export CXXFLAGS="$CXXFLAGS -Xlinker -lc++ -Xlinker -lc++abi"
# 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
%else
%global optflags %{optflags} -Wstrict-aliasing=0
export ARCH_FLAGS="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing"
export ARCH_FLAGS_CC="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing"
export ARCH_FLAGS_CXX="%{optflags} -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive -fvisibility-inlines-hidden"
export ARCH_FLAGS_OPT="%{optflags} -O2"
# Workaround for abf builds running out of memory
export ARCH_FLAGS_CC="$ARCH_FLAGS_CC -g0"
export ARCH_FLAGS_CXX="$ARCH_FLAGS_CC -g0"
%endif %endif
echo "Configure start at: "`date` >> ooobuildtime.log echo "Configure start at: "`date` >> ooobuildtime.log
@ -3104,13 +3095,7 @@ touch external/tarballs/.downloaded
# (tpg) silent output to reduce memory and free space # (tpg) silent output to reduce memory and free space
# We use make build here because the default target is "allandcheck". # We use make build here because the default target is "allandcheck".
# Checking should go to check # Checking should go to check
%make -r -s V=0 build-nocheck
%make -r -s V=0 \
ARCH_FLAGS="$ARCH_FLAGS" \
ARCH_FLAGS_CC="$ARCH_FLAGS_CC" \
ARCH_FLAGS_CXX="$ARCH_FLAGS_CXX" \
ARCH_FLAGS_OPT="$ARCH_FLAGS_OPT" \
build-nocheck
echo "Make end at: "`date` >> ooobuildtime.log echo "Make end at: "`date` >> ooobuildtime.log
echo "Install start at: "`date` >> ooobuildtime.log echo "Install start at: "`date` >> ooobuildtime.log