[libreoffice] 02/02: add conditional for system-coinmp
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.4
in repository libreoffice.
commit b0b7fb84867e9ba153b2dbeb42658773458e530e
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 6 00:05:36 2014 +0200
add conditional for system-coinmp
---
changelog | 2 +-
rules | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/changelog b/changelog
index 877853d..0acc222 100644
--- a/changelog
+++ b/changelog
@@ -10,7 +10,7 @@ libreoffice (1:4.4.0~alpha1~git20140805-1) UNRELEASED; urgency=low
transitional packages
* debian/rules:
- install tango_testing (if built, RELEASE_BUILD=n) into -tango
- - add conditional for system-libgltf, don't enable yet
+ - add conditionals for system-libgltf and system-coinmp, don't enable yet
-- Rene Engelhard <rene@debian.org> Mon, 26 May 2014 21:44:13 +0200
diff --git a/rules b/rules
index efb2cd9..cbb9432 100755
--- a/rules
+++ b/rules
@@ -229,10 +229,8 @@ endif
SYSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1)
-# fails to build with -Werror=format-security....
-ENABLE_COINMP=n
-# not implemented..
-#SYSTEM_STUFF += coinmp
+ENABLE_COINMP=y
+SYSTEM_STUFF += coinmp
USE_DBUS=y
ifeq "$(USE_DBUS)" "y"
ifneq (,$(findstring kfreebsd,$(DEB_HOST_ARCH)))
@@ -705,6 +703,8 @@ endif
ifneq ($(ENABLE_COINMP),y)
CONFIGURE_FLAGS += --disable-coinmp
+else
+ BUILD_DEPS += , coinor-libcoinmp-dev
endif
ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: