The following commit has been merged in the debian-experimental-3.4.0 branch:
commit a243dc9e399051f3fe4e0256b5d271ef61491287
Author: Rene Engelhard <[email protected]>
Date: Tue May 31 13:55:55 2011 +0000
remove SMALL_SYMBOLS option, gone upstream
diff --git a/changelog b/changelog
index c457048..8f873a3 100644
--- a/changelog
+++ b/changelog
@@ -12,6 +12,7 @@ libreoffice (1:3.4.0~rc2-1) UNRELEASED; urgency=low
- update for new extension and mingw configure switches
- update for new extension configure switches and for mingw
- temporarily build only for en-US
+ - remove SMALL_SYMBOLS option, gone upstream
* debian/control.sdk.in, debian/rules:
- stop building with STLport on i386, just create a symlink in ure.
Should suffice for compat with binary-only OOo extensions
diff --git a/rules b/rules
index 003c4c4..1ba2a93 100755
--- a/rules
+++ b/rules
@@ -527,17 +527,7 @@ endif
BUILD_DEPS += , libdb-dev
DBG_DBG_SUGGESTS += , $(shell dpkg -s libdb-dev | grep Depends | awk '{
print $$2 }' | sed -e s/dev/dbg/)
-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)))
- # ooo-build defaults to --enable-symbols (without SMALL)
- SMALL_SYMBOLS = n
- else
- SMALL_SYMBOLS = y
- endif
+ifeq "$(BUILD_DBG_PACKAGE)" "y"
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
@@ -545,10 +535,6 @@ else
DBG_DBG_SUGGESTS+= , libcurl4-dbg
endif
endif
-# Small symbols?
-ifeq "$(SMALL_SYMBOLS)" "y"
- CONFIGURE_FLAGS += --enable-symbols=SMALL
-endif
ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
ARCH_FLAGS += -O0
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
