[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.1_rc1-2-3-g2d3af36
The following commit has been merged in the debian-experimental-3.6 branch:
commit 2d3af361ab7f28cd62bb0f19e770a2cd2c8e68d1
Author: Rene Engelhard <rene@debian.org>
Date: Tue Aug 21 00:39:32 2012 +0200
make -g1 work again...
diff --git a/changelog b/changelog
index 1898235..2a7c3ac 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:3.6.1~rc1-3) UNRELEASED; urgency=low
* debian/patches/fix-S390X-CPUNAME.diff: add, as name says
* debian/patches/concat-deps-FreeBSD_kernel.diff: fix concat-deps.c for
kFreeBSD...
+ * debian/patches/debian-debug.diff: patch new gb_SYMBOLS in unxgcc.mk to
+ make ENABLE_SYMBOLS=SMALL (-g1) working again..
-- Rene Engelhard <rene@debian.org> Mon, 20 Aug 2012 18:33:08 +0200
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index 6477805..91e9b04 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -60,3 +60,22 @@ index c73333f..9338110 100644
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
--
LibreOffice packaging repository
Reply to: