[libreoffice] 01/03: ENABLE_MERGELIBS=n for kfreebsd-*. "Argument list too long"

[Rene Engelhard <rene@moszumanska.debian.org>]

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

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

commit 0cfc2774303be2ffe93045755fb8b58e4ed31fcf
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Jul 28 07:57:42 2015 +0200

    ENABLE_MERGELIBS=n for kfreebsd-*. "Argument list too long"
---
 changelog | 7 +++++++
 rules     | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/changelog b/changelog
index 25f446e..73cd1a8 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.0.0~rc4-2) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - ENABLE_MERGELIBS=n on kfreebsd-* for now ("Argument list too long")
+
+ -- Rene Engelhard <rene@debian.org>  Tue, 28 Jul 2015 00:27:08 +0200
+
 libreoffice (1:5.0.0~rc4-1) experimental; urgency=medium
 
   * New upstream release candidate
diff --git a/rules b/rules
index fa9baf1..bb916c2 100755
--- a/rules
+++ b/rules
@@ -415,7 +415,9 @@ USE_UCPP=y
 ifeq "$(USE_UCPP)" "y"
   SYSTEM_STUFF += ucpp
 endif
+ifeq (,$(findstring kfreebsd,$(DEB_HOST_ARCH)))
 ENABLE_MERGELIBS=y
+endif
 USE_OPENCL=y
 #10:15 <@_rene_> ahunt: I remember you wanted to do some endian things? did it 
 #                ever get done?

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