[libreoffice] 01/02: enable mergelibs only on 64bit archs (and i386)

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit 247b1fdb83f134827aa1fbdbb41b1056d03e1d95
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 13 11:49:01 2017 +0100

    enable mergelibs only on 64bit archs (and i386)
---
 changelog |  8 ++++++++
 rules     | 11 ++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index cb1acdd..6a8e756 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:5.3.0-2) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - enable mergelibs only on 64bit archs (and i386), ld goes to OOM on
+      mips(el) for example...
+
+ -- Rene Engelhard <rene at debian.org>  Thu, 02 Feb 2017 09:04:43 +0100
+
 libreoffice (1:5.3.0-1) experimental; urgency=medium
 
   * New upstream release
diff --git a/rules b/rules
index 44e89fb..2dd118e 100755
--- a/rules
+++ b/rules
@@ -477,8 +477,17 @@ USE_UCPP=y
 ifeq "$(USE_UCPP)" "y"
   SYSTEM_STUFF += ucpp
 endif
+# kfreebsd runs into SIZE_MAX problems, and the rest might
+# get OOM (mips(el)...) so enable mergelibs only for 64bit
+# archs (exception: i386)
 ifeq (,$(findstring kfreebsd,$(DEB_HOST_ARCH)))
-ENABLE_MERGELIBS=y
+  ifeq "$(DEB_HOST_ARCH_BITS)" "64"
+	ENABLE_MERGELIBS=y
+  else
+    ifeq "$(DEB_HOST_ARCH)" "i386"
+	ENABLE_MERGELIBS=y
+    endif
+  endif
 endif
 ENABLE_LTO=n
 USE_OPENCL=y

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git