[libreoffice] 01/01: enable coinmp (except on arm64 where it's BD-Uninstallable right now)
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit a626aea67766f95c1d0c9f034d6d59ae99de5183
Author: Rene Engelhard <rene@debian.org>
Date: Wed Oct 1 21:38:42 2014 +0200
enable coinmp (except on arm64 where it's BD-Uninstallable right now)
---
changelog | 3 ++-
control | 2 ++
rules | 5 ++++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index e1cc478..81c4de1 100644
--- a/changelog
+++ b/changelog
@@ -6,8 +6,9 @@ libreoffice (1:4.3.2-2) UNRELEASED; urgency=medium
* debian/rules:
- libnss3-1d-dbg -> libnss3-dbg in DBG_DBG_SUGGESTS
+ - enable coinmp (except on arm64 where it's BD-Uninstallable right now)
- -- Rene Engelhard <rene@debian.org> Tue, 30 Sep 2014 10:21:09 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 01 Oct 2014 21:37:10 +0200
libreoffice (1:4.3.2-1) unstable; urgency=medium
diff --git a/control b/control
index ccb18a1..907557f 100644
--- a/control
+++ b/control
@@ -11,6 +11,7 @@ Build-Depends: ant (>= 1.7.0),
binutils (>= 2.23) [mips mipsel],
bison,
bzip2,
+ coinor-libcoinmp-dev [!arm64],
debhelper (>= 7.2.3~),
default-jdk,
default-jdk (>= 1:1.7-48) [ia64],
@@ -4478,6 +4479,7 @@ Depends: ant (>= 1.7.0),
bison,
build-essential,
bzip2,
+ coinor-libcoinmp-dev,
debhelper (>= 7.2.3~),
default-jdk,
doxygen (>= 1.8.4),
diff --git a/rules b/rules
index afdb674..21eb0f7 100755
--- a/rules
+++ b/rules
@@ -251,7 +251,10 @@ endif
SYSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1)
+ENABLE_COINMP=y
+ifeq "$(DEB_HOST_ARCH)" "arm64"
ENABLE_COINMP=n
+endif
SYSTEM_STUFF += coinmp
USE_DBUS=y
ifeq "$(USE_DBUS)" "y"
@@ -823,7 +826,7 @@ endif
ifneq ($(ENABLE_COINMP),y)
CONFIGURE_FLAGS += --disable-coinmp
else
- BUILD_DEPS += , coinor-libcoinmp-dev
+ BUILD_DEPS += , coinor-libcoinmp-dev [!arm64]
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: