diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-06 18:43:15 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-09-10 13:00:53 +0000 |
| commit | 717af0973f64bb7cff5f14bd0fb973355559cc70 (patch) | |
| tree | 205719707de02ab6d49e0ccdd34229f06d92930d | |
| parent | e3b927787f3643f9e584cc80c974d5f907a94858 (diff) | |
gbuild: disable symbols on --enable-dbgutil --disable-symbols
Due to the setup of gb_DEBUGLEVEL in gbuild.mk, gb_SYMBOL was always
enabled when --enable-dbgutil is set, with no way to override it.
Fix that by turning configure's ENABLE_SYMBOLS into a tri-state, where
the new "FALSE" value, set by an explicit --disable-symbols, overrides
any implicit way of enabling symbols.
But by default an --enable-dbgutil still enables gb_SYMBOL.
Change-Id: I94c609863980ed1ab9c73d7a4861c394442b531d
(cherry picked from commit d9cbc837f84c415f5949a6893764dae8268f0d85)
Reviewed-on: https://gerrit.libreoffice.org/572
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
| -rw-r--r-- | berkeleydb/makefile.mk | 2 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 16 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 2 |
4 files changed, 17 insertions, 9 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 6ee001dd7c64..efed932a879a 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -82,7 +82,7 @@ CXXFLAGS:= .IF "$(COM)"=="GCC" CFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS) CXXFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS) -.IF "$(ENABLE_SYMBOLS)"!="" +.IF "$(ENABLE_SYMBOLS)"!="" && "$(ENABLE_SYMBOLS)"!="FALSE" CFLAGS+=-g CXXFLAGS+=-g .ENDIF diff --git a/configure.in b/configure.in index 276d84413f0e..11e20a033254 100644 --- a/configure.in +++ b/configure.in @@ -3686,7 +3686,11 @@ if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then ENABLE_SYMBOLS="TRUE" AC_MSG_RESULT([yes]) else - ENABLE_SYMBOLS= + if test -n "$enable_symbols" -a "$enable_symbols" = "no"; then + ENABLE_SYMBOLS="FALSE" + else + ENABLE_SYMBOLS= + fi AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_SYMBOLS) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index a787e145db89..c0e5ad273975 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -76,12 +76,6 @@ else gb_PRODUCT := $(false) endif -ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),) -gb_SYMBOL := $(true) -else -gb_SYMBOL := $(false) -endif - gb_TIMELOG := 0 ifneq ($(strip $(TIMELOG)$(timelog)),) gb_TIMELOG := 1 @@ -117,8 +111,18 @@ ENABLE_DEBUG_FOR := all endif endif +ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE) +gb_SYMBOL := $(false) +else +ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),) +gb_SYMBOL := $(true) +else ifneq ($(gb_DEBUGLEVEL),0) gb_SYMBOL := $(true) +else +gb_SYMBOL := $(false) +endif +endif endif ifneq ($(nodep),) diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 9d01c5eff57d..ea4bb0ed6652 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1042,7 +1042,7 @@ CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) CDEFS+= -DSUPD=$(UPD) # flags to enable build with symbols; required for crashdump feature -.IF ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || "$(ENABLE_SYMBOLS)"!="" +.IF ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || ("$(ENABLE_SYMBOLS)"!="" && "$(ENABLE_SYMBOLS)"!="FALSE") # if debug is enabled, this may enable less debug info than debug, so rely just on debug .IF "$(debug)" == "" CFLAGSENABLESYMBOLS_CC_ONLY*=$(CFLAGSENABLESYMBOLS) |