[libreoffice] 86/152: lp#1598492: disable mergelibs on BSD (thanks Joe Boden)

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 93be3ee7f63d50d3d6c7869eb2289f1b184aed69
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Jul 6 18:52:38 2016 +0200

    lp#1598492: disable mergelibs on BSD (thanks Joe Boden)
---
 changelog | 6 ++++++
 rules     | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index dede31d..b604805 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.2.0~rc1-0ubuntu1~yakkety2) yakkety; urgency=medium
+
+  * disable mergedlibs on BSD, thanks Joe Boden (LP: #1598492)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 06 Jul 2016 18:47:10 +0200
+
 libreoffice (1:5.2.0~rc1-0ubuntu1~yakkety1) yakkety; urgency=medium
 
   * New upstream rc release
diff --git a/rules b/rules
index 1253b0b..74226d9 100755
--- a/rules
+++ b/rules
@@ -740,7 +740,9 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   endif
   RUN_PYTESTS:=n
   PARALLEL_BUILD=y
-  ENABLE_MERGELIBS=y
+  ifeq (,$(filter kfreebsd,$(DEB_HOST_ARCH)))
+    ENABLE_MERGELIBS=y
+  endif
   ON_BUILDD := $(shell if [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] || echo $(CURDIR) | grep -q \/build\/buildd; then echo y; else echo n; fi)
   ifeq ($(ON_BUILDD),y)
     buildd_discspace_hack:=find workdir/ -type f -name '*.o' -exec mv {} {}_org \; -exec touch -r {}_org {} \; -exec rm {}_org \;

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