[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.3.3-3-105-g4d87458
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 5ddb245a10f3cf1d02733759a092fe9cfc690b59
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jul 6 00:42:49 2011 +0200
update debian-debug.diff to work with new variable name, also work with gbuild based modules and mention it in the changelog in the first place
diff --git a/changelog b/changelog
index 6a69aa6..515ee9d 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,9 @@ libreoffice (1:3.4.1-1) UNRELEASED; urgency=low
- (still) use libreoffice-build for now; not tagged,
use 317da212d159685a03607ff62c99b6ef8d5ea928
+ * debian/patches/debian-debug.diff: readd option to build with small
+ symbols (removed upstream), otherwise we get a too big -dbg (760M, 2G I-S)
+
* debian/rules:
- bump build-dep on libmdds-dev to >= 0.5.0
- build-depend on libgraphite2-dev instead of libgraphite-dev
@@ -31,7 +34,7 @@ libreoffice (1:3.4.1-1) UNRELEASED; urgency=low
* debian/libreoffice-common.triggers.in, libreoffice-*.p*.in:
new trigger running update_services_rdb, remove obsolete maintainer scripts
- -- Rene Engelhard <rene@debian.org> Sun, 03 Jul 2011 17:16:10 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 06 Jul 2011 00:38:09 +0200
libreoffice (1:3.3.3-4) unstable; urgency=low
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index c38f0cd..8e1034f 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -1,6 +1,6 @@
--- /dev/null 2011-06-02 14:58:12.448567841 +0000
+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/g1.diff 2011-06-16 22:10:26.000000000 +0000
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,74 @@
+diff --git a/configure.in b/configure.in
+index 3257668..afd36de 100755
+--- configure.in
@@ -25,6 +25,18 @@
+index c73333f..9338110 100644
+--- solenv/inc/unxgcc.mk
++++ 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=
@@ -37,6 +49,32 @@
+ CFLAGSDBGUTIL=
+
+ GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
++--- solenv/gbuild/platform/unxgcc.mk.orig 2011-07-05 12:38:23.398653265 +0200
+++++ solenv/gbuild/platform/unxgcc.mk 2011-07-05 14:10:50.598728992 +0200
++@@ -217,14 +217,19 @@
++ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
++
++ ifneq ($(gb_DEBUGLEVEL),0)
++-gb_LinkTarget_CXXFLAGS += -finline-limit=0 -fno-inline -fno-default-inline
++-gb_LinkTarget_CFLAGS += -finline-limit=0 -fno-inline -fno-default-inline
++-endif
++-
+++gb_LinkTarget_CXXFLAGS += -finline-limit=0 -fno-inline -fno-default-inline -ggdb2
+++gb_LinkTarget_CFLAGS += -finline-limit=0 -fno-inline -fno-default-inline -ggdb2
+++else
++ 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
+++endif
++
++ gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
++ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-06-16 22:12:11.000000000 +0000
+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-16 22:12:49.000000000 +0000
@@ -250,6 +250,8 @@
diff --git a/patches/update-debian-opt.diff b/patches/update-debian-opt.diff
index ca08647..f1b1bd5 100644
--- a/patches/update-debian-opt.diff
+++ b/patches/update-debian-opt.diff
@@ -29,7 +29,7 @@ index 4075123..7bc015b 100644
-+++ solenv/inc/unxlngi.mk (Arbeitskopie)
-@@ -30,7 +30,7 @@
++if [ -x /usr/bin/dpkg-buildflags ]; then
-++ CDEFAULTOPT=`dpkg-buildflags 2>/dev/null | grep -E -o "\-O[0-3]"`
+++ CDEFAULTOPT=`dpkg-buildflags --get CFLAGS 2>/dev/null | grep -E -o "\-O[0-3]"`
++else
++ CDEFAULTOPT=-O2
++fi
@@ -59,7 +59,7 @@ index 4075123..7bc015b 100644
+ SOLAR_JAVA*=
+ # default optimization level for product code
+-CDEFAULTOPT*=-O2
-++CDEFAULTOPT*=$(shell dpkg-buildflags 2>/dev/null | $GREP -E -o "\-O[0-3]" || echo "-O2")
+++CDEFAULTOPT*=$(shell dpkg-buildflags --get CFLAGS 2>/dev/null | $(GREP) -E -o "\-O[0-3]" || echo "-O2")
+ # architecture dependent flags for the C and C++ compiler that can be changed by
+ # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+ ARCH_FLAGS*=
--
LibreOffice packaging repository
Reply to: