[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.3.3-1-82-g711c1a2
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit e8f0fc6ac940cc61ddb1e6dc604ef94ec97387e7
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jun 16 22:10:04 2011 +0000
Revert "remove SMALL_SYMBOLS option, gone upstream"
add patch to readd --enable-symbols=SMALL, otherwise we need to much space
and get a HUGHE -dbg...
This reverts commit a243dc9e399051f3fe4e0256b5d271ef61491287.
diff --git a/changelog b/changelog
index 20356e4..4aa77c0 100644
--- a/changelog
+++ b/changelog
@@ -12,7 +12,6 @@ libreoffice (1:3.4.0-1) UNRELEASED; urgency=low
- build-depend on libgraphite2-dev instead of libgraphite-dev
- update for new extension and mingw configure switches
- temporarily build only for en-US
- - remove SMALL_SYMBOLS option, gone upstream
- temporarily disable -evolution and -filter-binfilter until we get
the (de-)registering of them fixed
- temprarily don't install gengal, not built anymore since the switch to
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
new file mode 100644
index 0000000..c38f0cd
--- /dev/null
+++ b/patches/debian-debug.diff
@@ -0,0 +1,50 @@
+--- /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 @@
++diff --git a/configure.in b/configure.in
++index 3257668..afd36de 100755
++--- configure.in
+++++ configure.in
++@@ -1663,8 +1663,13 @@ 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
++- ENABLE_SYMBOLS="TRUE"
++- AC_MSG_RESULT([yes])
+++ if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
+++ ENABLE_SYMBOLS="SMALL"
+++ AC_MSG_RESULT([yes, small ones])
+++ else
+++ ENABLE_SYMBOLS="TRUE"
+++ AC_MSG_RESULT([yes])
+++ fi
++ else
++ ENABLE_SYMBOLS=
++ AC_MSG_RESULT([no])
++diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
++index c73333f..9338110 100644
++--- solenv/inc/unxgcc.mk
+++++ solenv/inc/unxgcc.mk
++@@ -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
+--- 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 @@
+
+ # build using -O2 on x86 and sparc according to Debian policy.
+ debian-opt.diff
++# ... and reintroduce -g1
++g1.diff
+
+ # on debian based systems, we know where our soffice is
+ jurt-soffice-location.diff
diff --git a/patches/series b/patches/series
index 7fcbf9f..88f0330 100644
--- a/patches/series
+++ b/patches/series
@@ -9,3 +9,4 @@ prevent-oosplash-smoketest-hangs.diff
disable-ooinstall-in-package-ooo.diff
jurt-soffice-location.diff
packcomponents-remove-split-components.diff
+debian-debug.diff
diff --git a/rules b/rules
index f4d3bab..dcb51bf 100755
--- a/rules
+++ b/rules
@@ -527,7 +527,16 @@ endif
BUILD_DEPS += , libdb-dev
DBG_DBG_SUGGESTS += , $(shell dpkg -s libdb-dev | grep Depends | awk '{ print $$2 }' | sed -e s/dev/dbg/)
-ifeq "$(BUILD_DBG_PACKAGE)" "y"
+ifneq "$(BUILD_DBG_PACKAGE)" "y"
+ # build with small symbols anyway
+ SMALL_SYMBOLS = y
+else
+ # -g gives a far too big deb (>400M, ca. 1GB I-S)
+ ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ SMALL_SYMBOLS = n
+ else
+ SMALL_SYMBOLS = y
+ endif
DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
ifeq "$(USE_LIBCURL4)" "y"
DBG_DBG_SUGGESTS+= , libcurl3-dbg
@@ -535,6 +544,12 @@ ifeq "$(BUILD_DBG_PACKAGE)" "y"
DBG_DBG_SUGGESTS+= , libcurl4-dbg
endif
endif
+# Small symbols?
+ifeq "$(SMALL_SYMBOLS)" "y"
+ CONFIGURE_FLAGS += --enable-symbols=SMALL
+else
+ CONFIGURE_FLAGS += --enable-symbols
+endif
ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
ARCH_FLAGS += -O0
--
LibreOffice packaging repository
Reply to: