[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - 2 commits - configure.ac solenv/gbuild

[Libreoffice Gerrit user]

 configure.ac            |    6 +-----
 solenv/gbuild/gbuild.mk |    8 ++++----
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 742d15fe623830773541eccf39571ce316751d5a
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Aug 17 13:35:58 2016 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Aug 10 18:07:19 2018 +0200

    "make debug=t" enables debuginfo again
    
    ...which had inadvertently been broken with
    99db9f2295eb9a8b3288df9798a292b8d6e1b854 "Make --enable-symbols orthogonal to
    --enable-debug/-dbgutil"
    
    Change-Id: I3962aa8c67426f3aebc5ad746f7ac281c68d941a
    (cherry picked from commit 62c4a8aacf76771e97a8da35096e6ad69a11979a)

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 168a205cb63b..983473bfdea4 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -87,12 +87,14 @@ gb_DEBUGLEVEL := 1
 # make DEBUG=true should force -g
 ifeq ($(origin DEBUG),command line)
 ENABLE_DEBUGINFO_FOR := all
+ENABLE_SYMBOLS := TRUE
 endif
 endif
 ifneq ($(strip $(debug)),)
 gb_DEBUGLEVEL := 1
 ifeq ($(origin debug),command line)
 ENABLE_DEBUGINFO_FOR := all
+ENABLE_SYMBOLS := TRUE
 endif
 endif
 ifeq ($(gb_ENABLE_DBGUTIL),$(true))
commit 8e5525be56447239f2322f0acadd057314ae6677
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Jul 8 17:49:51 2016 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Aug 10 18:07:07 2018 +0200

    Get rid of odd ENABLE_SYMBOLS=FALSE
    
    * None of the other ENABLE_* support anything but TRUE or empty.
    
    * Other checks for -n "$ENABLE_SYMBOLS" in configure.ac are confused by it.
    
    * solenv/gbuild/gbuild.help.txt talks about "If not empty", not mentioning "FALSE".
    
    * A missing (redundant) explicit --disable-symbols left gb_SYMBOL uninitialized
      (instead of setting it to $(false))---but without consequences, as all the places
      checking gb_SYMBOL explicitly check for $(true).
    
    Change-Id: Id004189de27a7936862dab3a5fd84d549c06af2b
    Reviewed-on: https://gerrit.libreoffice.org/27057
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 436ee0989d1bc321886fac5a3507fc1d16650abd)

diff --git a/configure.ac b/configure.ac
index 67a25ac49ed6..71775caff9df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4023,11 +4023,7 @@ if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
     fi
     AC_MSG_RESULT([yes])
 else
-    if test -n "$enable_symbols" -a "$enable_symbols" = "no"; then
-        ENABLE_SYMBOLS="FALSE"
-    else
-        ENABLE_SYMBOLS=
-    fi
+    ENABLE_SYMBOLS=
     AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_SYMBOLS)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 04056cd136c8..168a205cb63b 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -117,12 +117,10 @@ gb_Deliver_HARDLINK := $(true)
 endif
 
 # note: ENABLE_CRASHDUMP turns on gb_SYMBOL
-ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE)
-gb_SYMBOL := $(false)
-else
 ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_CRASHDUMP)),)
 gb_SYMBOL := $(true)
-endif
+else
+gb_SYMBOL := $(false)
 endif
 
 ifneq ($(strip $(ENABLE_PCH)),)