From 4d98042d03c85251e42d994f2fb2314cf5dba707 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 4 Dec 2016 02:33:27 +0100 Subject: [PATCH] Also set and unset CFLAGS --- qt5-qtwebengine.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index a16dd88..5d3fe7c 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -338,6 +338,11 @@ sed -i -e 's/=-g$/=-g1/g' src/core/gyp_run.pro export STRIP=strip export NINJAFLAGS="-v %{_smp_mflags}" export NINJA_PATH=%{_bindir}/ninja-build +export CFLAGS="%{optflags}" +%ifnarch x86_64 +# most arches run out of memory with full debuginfo, so use -g1 on non-x86_64 +export CFLAGS=`echo "$CFLAGS" | sed -e 's/ -g / -g1 /g'` +%endif export CXXFLAGS="%{optflags} -fno-delete-null-pointer-checks" %ifnarch x86_64 # most arches run out of memory with full debuginfo, so use -g1 on non-x86_64 @@ -349,7 +354,9 @@ pushd %{_target_platform} %{qmake_qt5} CONFIG+="webcore_debug v8base_debug force_debug_info" WEBENGINE_CONFIG+="use_system_icu use_system_protobuf" .. -# if we keep this set here, gyp picks up duplicate flags +# if we keep these set here, gyp picks up duplicate flags +unset CFLAGS +export CFLAGS unset CXXFLAGS export CXXFLAGS @@ -471,7 +478,7 @@ popd - Rebase no-neon patch, add new arm-fpu-fix patch where no-neon not wanted - Try enabling arm_neon unconditionally, #1282495 should be fixed even in F23 - Remove Android depenencies from openmax_dl ARM NEON detection (detect.c) -- Try unsetting CXXFLAGS between qmake and make +- Set CFLAGS, unset both CFLAGS and CXXFLAGS between qmake and make * Thu Nov 10 2016 Helio Chissini de Castro - 5.7.1-1 - New upstream version