[libreoffice] 04/04: fix build with a multiarched boost, thanks Bjoern Michaelsen
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.1
in repository libreoffice.
commit 8c8db1e3e52dd41e400f9231c481685c4e076ff1
Author: Rene Engelhard <rene@debian.org>
Date: Tue Aug 20 14:05:28 2013 +0200
fix build with a multiarched boost, thanks Bjoern Michaelsen
---
changelog | 1 +
rules | 3 +++
2 files changed, 4 insertions(+)
diff --git a/changelog b/changelog
index 532b284..57e0432 100644
--- a/changelog
+++ b/changelog
@@ -15,6 +15,7 @@ libreoffice (1:4.1.1~rc1-2) UNRELEASED; urgency=low
- "fix" to also ignore check failures on kfreebsd-{i386,amd64} (assuming
openjdk use)
- use default boost (1.54) again
+ - fix build with a multiarched boost, thanks Bjoern Michaelsen
* debian/libreoffice-dev-doc.links: add api -> docs symlink as Javadocs
should be in api/
* debian/libreoffice-script-provider-python.bug-script: remove, obsolete;
diff --git a/rules b/rules
index ff4c7b7..ac0c238 100755
--- a/rules
+++ b/rules
@@ -995,6 +995,9 @@ ifneq (,$(filter boost, $(SYSTEM_STUFF)))
endif
endif
endif
+ ifeq "$(shell if [ -e /usr/lib/$(DEB_HOST_MULTIARCH)/libboost_date_time.so ]; then echo true; fi)" "true"
+ CONFIGURE_FLAGS += --with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+ endif
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: