From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sun, 21 Jun 2020 11:07:16 +0000 (+0100)
Subject: debian-debug
X-Git-Tag: archive/raspbian/1%6.4.5_rc1-2+rpi1^2~44
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6bf0bfb20e7f7fb8a8f74d92f2e7155b02fc7185;p=libreoffice.git

debian-debug


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

diff --git a/config_host.mk.in b/config_host.mk.in
index 706ff53553d..9d51a9f5d1c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -183,6 +183,7 @@ export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
 export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
 export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@
 export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
+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 b903c4e9c45..8647ee508e8 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 712a61df544..84d26a74a3f 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -198,6 +198,8 @@ gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow
 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