From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 15 Jul 2020 18:31:45 +0000 (+0100)
Subject: debian-debug
X-Git-Tag: archive/raspbian/1%7.0.0_rc2-1+rpi1^2~37
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=058e6777f56243db6d4be3fbb9d3c91f73333632;p=libreoffice.git

debian-debug


Gbp-Pq: Name debian-debug.diff
---

diff --git a/config_host.mk.in b/config_host.mk.in
index 11d1887b180..f1e58670a5c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -209,6 +209,7 @@ export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@
 export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
 export ENABLE_SKIA=@ENABLE_SKIA@
 export ENABLE_SKIA_DEBUG=@ENABLE_SKIA_DEBUG@
+export enable_symbols=@enable_symbols@
 export ENABLE_SYMBOLS_FOR=@ENABLE_SYMBOLS_FOR@
 export ENABLE_VALGRIND=@ENABLE_VALGRIND@
 export ENABLE_VLC=@ENABLE_VLC@
diff --git a/configure.ac b/configure.ac
index 8d5066447b0..6617e1321fd 100644
Binary files a/configure.ac and b/configure.ac differ
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 1707a7481ee..ce689a8dac7 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -210,6 +210,8 @@ gb_COMPILERDEBUGOPTFLAGS := -Og
 ifeq ($(OS),ANDROID)
 gb_DEBUGINFO_FLAGS=-glldb
 # Clang does not know -ggdb2 or some other options
+else ifeq ($(enable_symbols),SMALL)
+gb_DEBUGINFO_FLAGS=-g1
 else ifeq ($(HAVE_GCC_GGDB2),TRUE)
 gb_DEBUGINFO_FLAGS=-ggdb2
 else