[Libreoffice-commits] .: configure.in solenv/gbuild solenv/inc

[Caolán McNamara]

 configure.in            |   12 ++----------
 solenv/gbuild/gbuild.mk |    2 +-
 solenv/inc/unxbsdi2.mk  |    6 +-----
 solenv/inc/unxbsdi3.mk  |    6 +-----
 solenv/inc/unxbsdx3.mk  |    6 +-----
 solenv/inc/unxfbsd.mk   |    9 ++-------
 solenv/inc/unxgcc.mk    |    9 ++-------
 solenv/inc/unxmacxi.mk  |    6 +-----
 8 files changed, 11 insertions(+), 45 deletions(-)

New commits:
commit 006c3f5707418f5f53c725d4c8e905a857547600
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 22 11:26:06 2011 +0000

    drop -g1 and align gmake gd_SYMBOL from TRUE

diff --git a/configure.in b/configure.in
index 838ddf5..c7da5ee 100755
--- a/configure.in
+++ b/configure.in
@@ -221,9 +221,6 @@ AC_ARG_ENABLE(symbols,
         [Include debugging symbols in output. WARNING - a complete build needs
          8 Gb of space and takes much longer (enables -g compiler flag).])
     [
-                          --enable-symbols=SMALL
-                                     sets the gcc -g1 setting which is smaller.
-
                           Enabling symbols disables the stripping of the solver
                           (--disable-strip-solver).
     ],
@@ -1647,13 +1644,8 @@ dnl whether to include symbols into final build.
 dnl ===================================================================
 AC_MSG_CHECKING([whether to include symbols])
 if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
-    if test "$enable_symbols" = "small" -o "$enable_symbols" = "SMALL"; then
-       ENABLE_SYMBOLS="SMALL"
-       AC_MSG_RESULT([yes, small])
-    else
-       ENABLE_SYMBOLS="TRUE"
-       AC_MSG_RESULT([yes])
-    fi
+   ENABLE_SYMBOLS="TRUE"
+   AC_MSG_RESULT([yes])
 else
    ENABLE_SYMBOLS=
    AC_MSG_RESULT([no])
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 41169fd..5291cca 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -81,7 +81,7 @@ gb_PRODUCT := $(false)
 endif
 endif
 
-ifneq ($(strip $(SYMBOL)$(symbol)$(SYMBOLS)$(symbols)),)
+ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),)
 gb_SYMBOL := $(true)
 else
 gb_SYMBOL := $(false)
diff --git a/solenv/inc/unxbsdi2.mk b/solenv/inc/unxbsdi2.mk
index 08641ad..f0b5765 100644
--- a/solenv/inc/unxbsdi2.mk
+++ b/solenv/inc/unxbsdi2.mk
@@ -59,12 +59,8 @@ CC*=gcc
 # flags for C and C++ Compiler
 CFLAGS+=-fmessage-length=0 -c
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
+# flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g
-.ENDIF
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxbsdi3.mk b/solenv/inc/unxbsdi3.mk
index 872c347..e05a02b 100644
--- a/solenv/inc/unxbsdi3.mk
+++ b/solenv/inc/unxbsdi3.mk
@@ -48,12 +48,8 @@ CFLAGSOPT=-Os -fno-strict-aliasing             # optimizing for products
 CFLAGSOPT=                                     # no optimizing for non products
 .ENDIF # "$(PRODUCT)"!=""
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
+# flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g
-.ENDIF
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxbsdx3.mk b/solenv/inc/unxbsdx3.mk
index 986cd42..254a3f6 100644
--- a/solenv/inc/unxbsdx3.mk
+++ b/solenv/inc/unxbsdx3.mk
@@ -48,12 +48,8 @@ CFLAGSOPT=-Os -fno-strict-aliasing             # optimizing for products
 CFLAGSOPT=                                     # no optimizing for non products
 .ENDIF # "$(PRODUCT)"!=""
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
+# flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g
-.ENDIF
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index e22499a..f751384 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -74,13 +74,8 @@ CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
 CFLAGS+=-fmessage-length=0 -c
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
+# flags to enable build with symbols
+CFLAGSENABLESYMBOLS=-g
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index e5cd920..b2e22b9 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -72,13 +72,8 @@ CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
 CFLAGS+=-fmessage-length=0 -c
 
-# flags to enable build with symbols; required for crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-
-.ENDIF
+# flags to enable build with symbols
+CFLAGSENABLESYMBOLS=-g
 
 # flags for the C++ Compiler
 CFLAGSCC= -pipe $(ARCH_FLAGS)
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index 7c7f0a8..ed04840 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -42,12 +42,8 @@ CXXCPP*:=g++ -E $(EXTRA_CFLAGS)
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 .ENDIF # "$(SYSBASE)"!=""
 
-# flags to enable build with symbols; required by crashdump feature
-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-CFLAGSENABLESYMBOLS=-g1
-.ELSE
+# flags to enable build with symbols
 CFLAGSENABLESYMBOLS=-g
-.ENDIF
 
 # Include generic Mac OS X makefile
 .INCLUDE : unxmacx.mk