[libreoffice] 02/05: git update; update debian-debug.diff
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit a7390c17634720a33c90efcfeaef3dda14170756
Author: Rene Engelhard <rene@debian.org>
Date: Mon Nov 2 22:55:06 2015 +0100
git update; update debian-debug.diff
---
changelog | 2 +-
patches/debian-debug.diff | 41 ++++++++++++++---------------------------
2 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/changelog b/changelog
index 6de464f..3a2b296 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.1.0~beta1~git20101024-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.0~beta1~git20151102-1) UNRELEASED; urgency=medium
* New upstream snapshot
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index 28cd24b..911f602 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -24,36 +24,23 @@ index 3257668..afd36de 100755
else
if test -n "$enable_symbols" -a "$enable_symbols" = "no"; then
ENABLE_SYMBOLS="FALSE"
---- 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/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
+index 9de88a2..9161a4e 100644
+--- a/solenv/gbuild/platform/com_GCC_defs.mk
++++ b/solenv/gbuild/platform/com_GCC_defs.mk
+@@ -153,11 +153,15 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
+ gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow
-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))
+ # Clang does not know -ggdb2 or some other options
+ifeq ($(ENABLE_SYMBOLS),SMALL)
-+gb_LinkTarget_CXXFLAGS += -g1
-+gb_LinkTarget_CFLAGS += -g1
++gb_DEBUGINFO_FLAGS=-g1
+else
- gb_LinkTarget_CXXFLAGS += $(GGDB2)
- gb_LinkTarget_CFLAGS += $(GGDB2)
+ ifeq ($(HAVE_GCC_GGDB2),TRUE)
+ gb_DEBUGINFO_FLAGS=-ggdb2
+ else
+ gb_DEBUGINFO_FLAGS=-g2
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
+ ifeq ($(HAVE_GCC_FINLINE_LIMIT),TRUE)
+ FINLINE_LIMIT0=-finline-limit=0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: