[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc2-2-19-gd81bce2
The following commit has been merged in the debian-experimental-3.5 branch:
commit 50153960f4cfacae519c39e5c45f344ae50b3a56
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 31 19:22:09 2012 +0100
fix and cleanup symbols logic
diff --git a/changelog b/changelog
index f969ca2..9ad1503 100644
--- a/changelog
+++ b/changelog
@@ -9,9 +9,10 @@ libreoffice (1:3.5.0~rc2-3) UNRELEASED; urgency=low
check
- disable -dbg package on ia64 and build without symbols there
First step into making libooxlo.so not too big for it (though not
- sufficient). As it's not sufficient, disable ia64
+ sufficient). As it's not sufficient, disable ia64.
+ Simplify conditionals
- -- Rene Engelhard <rene@debian.org> Mon, 30 Jan 2012 13:05:34 +0000
+ -- Rene Engelhard <rene@debian.org> Tue, 31 Jan 2012 19:13:53 +0100
libreoffice (1:3.5.0~rc2-2) experimental; urgency=low
diff --git a/rules b/rules
index ca81588..dab9fc6 100755
--- a/rules
+++ b/rules
@@ -161,6 +161,10 @@ ENABLE_KDEAB=n
QT_MINVER= (>= 4.5)
KDELIBS_MINVER= (>= 4:4.3.4)
BUILD_DBG_PACKAGE=y
+ifeq "$(BUILD_DBG_PACKAGE)" "y"
+ ENABLE_SYMBOLS=y
+ SMALL_SYMBOLS=y
+endif
ifeq "$(ENABLE_JAVA)" "y"
# NOTE: If you change this while gcj/ant multiarch combo is still broken
# you need to disable bsh scripting engine completely (see disable-rhino.diff)
@@ -582,39 +586,29 @@ ifneq (,$(findstring db,$(SYSTEM_STUFF)))
DBG_DBG_SUGGESTS += , $(shell dpkg -s libdb-dev | grep Depends | awk '{ print $$2 }' | sed -e s/dev/dbg/)
endif
-ifneq "$(BUILD_DBG_PACKAGE)" "y"
- ifneq "$(DEB_HOST_ARCH)" "ia64"
- # build with small symbols anyway
- SMALL_SYMBOLS = y
- else
- SMALL_SYMBOLS = n
- endif
-else
- ifeq "$(SQUEEZE_BACKPORT)" "y"
- SMALL_SYMBOLS = y
- else
- ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
+ifeq "$(BUILD_DBG_PACKAGE)" "y"
+ # {,kfreebsd-}{i386,amd64} should be big and fast (xz!) enough for this
+ ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
SMALL_SYMBOLS = n
USE_XZ_COMPRESS = y
- else
- ifneq (,$(findstring amd64,$(DEB_HOST_ARCH)))
+ else
+ ifneq (,$(findstring amd64,$(DEB_HOST_ARCH)))
SMALL_SYMBOLS = n
USE_XZ_COMPRESS = y
- else
- SMALL_SYMBOLS = y
- endif
endif
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, libhunspell-$(shell pkg-config --modversion hunspell | cut -d. -f1,2)-0-dbg, libcurl4-dbg
endif
-# Small symbols?
-ifeq "$(SMALL_SYMBOLS)" "y"
+ifeq "$(ENABLE_SYMBOLS)" "y"
+ # Small symbols?
+ ifeq "$(SMALL_SYMBOLS)" "y"
CONFIGURE_FLAGS += --enable-symbols=SMALL
CFLAGS := $(shell echo $(CFLAGS) | sed -e "s/-g/-g1/")
CXXFLAGS := $(shell echo $(CXXFLAGS) | sed -e "s/-g/-g1/")
export CFLAGS CXXFLAGS
-else
+ else
CONFIGURE_FLAGS += --enable-symbols
+ endif
endif
ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CONFIGURE_FLAGS += --enable-debug
--
LibreOffice packaging repository
Reply to: