[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc2-1-18-g87cb1a6



The following commit has been merged in the debian-experimental-3.5 branch:
commit b9fa40cd04a0244c0c1b874162addc479b352e86
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Jan 29 22:47:47 2012 +0100

    disable -dbg package on ia64 and build without symbols there

diff --git a/changelog b/changelog
index f4aa722..affea0c 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,9 @@ libreoffice (1:3.5.0~rc2-3) UNRELEASED; urgency=low
   * debian/rules:
     - give gb_FULLDEPS= to actual make check call, not debian/rules
       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)
 
  -- Rene Engelhard <rene@debian.org>  Sun, 29 Jan 2012 17:00:47 +0100
 
diff --git a/rules b/rules
index 219eff1..2ac698a 100755
--- a/rules
+++ b/rules
@@ -414,6 +414,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
 	BUILD_JARS_NATIVE=y
 endif
 
+ifeq "$(DEB_HOST_ARCH)" "ia64"
+  BUILD_DBG_PACKAGE=n
+endif
+
 ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
 OOO_NPSOPLUGIN_ARCHS = $(OOO_ARCHS)
 else
@@ -579,8 +583,12 @@ ifneq (,$(findstring db,$(SYSTEM_STUFF)))
 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

-- 
LibreOffice packaging repository


Reply to: