[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-126-ga8004f3
The following commit has been merged in the debian-experimental-4.0 branch:
commit 77966827b413763c96d80e75e8e689a2a24ddd3d
Author: Rene Engelhard <rene@debian.org>
Date: Sat Nov 24 12:49:50 2012 +0100
Revert "git update; adapt for gone --enable-symbols"
This reverts commit 8500ace88ce78691e9a0a9ec45d08aa0a2c82018.
diff --git a/changelog b/changelog
index 47bba3b..8475445 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.0.0~alpha1+git20121121-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.0~alpha1+git20121124-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
new file mode 100644
index 0000000..34406df
--- /dev/null
+++ b/patches/debian-debug.diff
@@ -0,0 +1,87 @@
+diff --git a/configure.ac b/configure.in
+index 3257668..afd36de 100755
+--- libreoffice-3.5.0/configure.ac
++++ libreoffice-3.5.0/configure.ac
+@@ -3361,13 +3361,19 @@ dnl Check for enable symbols option
+ dnl ===================================================================
+ AC_MSG_CHECKING([whether to include symbols while preserve optimization])
+ if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
+- ENABLE_SYMBOLS="TRUE"
++ if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
++ ENABLE_SYMBOLS="TRUE"
++ AC_MSG_RESULT([yes])
++ else
++ ENABLE_SYMBOLS="SMALL"
++ AC_MSG_RESULT([yes, small ones])
++ fi
++
+ if test -n "$ENABLE_DBGUTIL"; then
+ AC_MSG_ERROR([--enable-dbgutil cannot be used with --enable-symbols])
+ elif test -n "$ENABLE_DEBUG"; then
+ AC_MSG_ERROR([--enable-debug cannot be used with --enable-symbols])
+ fi
+- AC_MSG_RESULT([yes])
+ else
+ if test -n "$enable_symbols" -a "$enable_symbols" = "no"; then
+ ENABLE_SYMBOLS="FALSE"
+diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
+index c73333f..9338110 100644
+--- libreoffice-3.5.0/solenv/inc/unxgcc.mk
++++ libreoffice-3.5.0/solenv/inc/unxgcc.mk
+@@ -73,7 +73,11 @@
+ CFLAGS+=-fmessage-length=0 -c
+
+ # flags to enable build with symbols
++.IF "$(ENABLE_SYMBOLS)" == "SMALL"
++CFLAGSENABLESYMBOLS=-g1
++.ELSE
+ CFLAGSENABLESYMBOLS=-g
++.ENDIF
+
+ # flags for the C++ Compiler
+ CFLAGSCC= -pipe $(ARCH_FLAGS)
+@@ -106,7 +106,11 @@ CFLAGSSLOCUIMT=$(PICSWITCH)
+ # Compiler flags for profiling
+ CFLAGSPROF=
+ # Compiler flags for debugging
++.IF "$(ENABLE_SYMBOLS)"=="SMALL"
++CFLAGSDEBUG=-g1
++.ELSE
+ CFLAGSDEBUG=-g
++.ENDIF
+ CFLAGSDBGUTIL=
+
+ GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
+--- a/solenv/gbuild/platform/com_GCC_defs.mk-old 2012-04-23 22:19:05.806843257 +0200
++++ b/solenv/gbuild/platform/com_GCC_defs.mk 2012-04-23 22:19:52.943076997 +0200
+@@ -131,7 +131,11 @@
+ FNO_DEFAULT_INLINE=-fno-default-inline
+ endif
+
++ifeq ($(ENABLE_SYMBOLS),SMALL)
++gb_DEBUG_CFLAGS := -g1 $(FINLINE_LIMIT0) $(FNO_INLINE)
++else
+ gb_DEBUG_CFLAGS := $(GGDB2) $(FINLINE_LIMIT0) $(FNO_INLINE)
++endif
+ gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE)
+
+
+diff --git a/unxgcc.mk-old b/unxgcc.mk
+index b85fbee..07a7012 100644
+--- libreoffice-3.6.1/solenv/gbuild/platform/unxgcc.mk-old
++++ libreoffice-3.6.1/solenv/gbuild/platform/unxgcc.mk
+@@ -192,9 +192,14 @@ gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
+ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS)
+
+ ifeq ($(gb_SYMBOL),$(true))
++ifeq ($(ENABLE_SYMBOLS),SMALL)
++gb_LinkTarget_CXXFLAGS += -g1
++gb_LinkTarget_CFLAGS += -g1
++else
+ gb_LinkTarget_CXXFLAGS += $(GGDB2)
+ gb_LinkTarget_CFLAGS += $(GGDB2)
+ endif
++endif
+
+ # note that `cat $(extraobjectlist)` is needed to build with older gcc versions, e.g. 4.1.2 on SLED10
+ # we want to use @$(extraobjectlist) in the long run
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index f8be3d4..2f52260 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -35,9 +35,9 @@ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index c094bb4..a0608f4 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
-@@ -61,6 +61,8 @@ gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(call gb_LinkTarget__g
+@@ -54,6 +54,8 @@
+ gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(call gb_LinkTarget__get_debugcxxflags,$(1)))
gb_LinkTarget__get_objcxxflags=$(if $(OBJCXXFLAGS),$(OBJCXXFLAGS),$(call gb_LinkTarget__get_debugcxxflags,$(1)))
- gb_LinkTarget__get_ldflags=$(if $(LDFLAGS),$(LDFLAGS),$(call gb_LinkTarget__get_debugldflags,$(1)))
+LDFLAGS += $(HARDEN_LDFLAGS)
+
diff --git a/patches/series b/patches/series
index bf9e395..28bb176 100644
--- a/patches/series
+++ b/patches/series
@@ -3,6 +3,7 @@ debian-opt.diff
gcj-safe-jni-h-include.diff
jurt-soffice-location.diff
split-evoab.diff
+debian-debug.diff
#rhino-build-optional.diff
disable-dynamic-list-cpp.diff
fix-system-lpsolve-build.diff
diff --git a/rules b/rules
index 4c6acbc..eb75da7 100755
--- a/rules
+++ b/rules
@@ -609,13 +609,12 @@ endif
ifeq "$(ENABLE_SYMBOLS)" "y"
# Small symbols?
ifeq "$(SMALL_SYMBOLS)" "y"
- CFLAGS := -g1
- CXXFLAGS := -g1
+ CONFIGURE_FLAGS += --enable-symbols=SMALL
+ CFLAGS := $(shell echo $(CFLAGS) | sed -e "s/-g/-g1/")
+ CXXFLAGS := $(shell echo $(CXXFLAGS) | sed -e "s/-g/-g1/")
export CFLAGS CXXFLAGS
else
- CFLAGS := -g
- CXXFLAGS := -g
-export CFLAGS CXXFLAGS
+ CONFIGURE_FLAGS += --enable-symbols
endif
endif
ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
--
LibreOffice packaging repository
Reply to: