[gnome-sdk-images] Fix webkit debug disable



commit e1a2143c171b10214ca3a3396cea85ea4a853edc
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Mar 25 22:32:32 2015 +0100

    Fix webkit debug disable

 packages/SPECS/webkitgtk4.spec |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/packages/SPECS/webkitgtk4.spec b/packages/SPECS/webkitgtk4.spec
index 64bf510..c1b9615 100644
--- a/packages/SPECS/webkitgtk4.spec
+++ b/packages/SPECS/webkitgtk4.spec
@@ -57,20 +57,19 @@ files for developing applications that use %{name}.
 
 %build
 
+# Disable ld.gold on s390 as it does not have it.
+# Also for aarch64 as the support is in upstream, but not packaged in Fedora.
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
 %if %{with_webkit_debug}
 # Decrease debuginfo verbosity to reduce memory consumption even more
-%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+CFLAGS="%(echo %{optflags} | sed 's/-g/-g1/')"
 %else
 # Disable -g to save disk space during build
-%global optflags %(echo %{optflags} | sed 's/-g / /')
+CFLAGS="%(echo %{optflags} | sed 's/-g//')"
 %endif
-
-# Disable ld.gold on s390 as it does not have it.
-# Also for aarch64 as the support is in upstream, but not packaged in Fedora.
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+export CFLAGS ; \
+CXXFLAGS="${CFLAGS}" ; export CXXFLAGS ; \
 %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
 /usr/bin/cmake \
         -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]