[libvigraimpex] 03/06: deb/rules: build with Boost.Thread on armel

[Daniel Stender]

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

danstender-guest pushed a commit to branch master
in repository libvigraimpex.

commit 2a5fd0fe4a9c86dafab565c99b4038e858ddb2e9
Author: Daniel Stender <debian at danielstender.com>
Date:   Tue Mar 1 22:32:51 2016 +0100

    deb/rules: build with Boost.Thread on armel
---
 debian/changelog | 4 +++-
 debian/control   | 3 ++-
 debian/rules     | 9 ++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 28ab0e8..4d42100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
 libvigraimpex (1.10.0+git20160211.167be93-2) UNRELEASED; urgency=medium
 
   * deb/control: added missing Breaks for libvigraimpex6 (Closes: #815795).
+  * deb/rules: build with Boost.Thread on armel (Closes: #814606) [plus, added
+    libboost-thread-dev to build-deps in control; thanks to Ullrich Koethe].
   * Updated uploader email address.
 
- -- Daniel Stender <stender at debian.org>  Tue, 01 Mar 2016 19:38:27 +0100
+ -- Daniel Stender <stender at debian.org>  Tue, 01 Mar 2016 22:30:58 +0100
 
 libvigraimpex (1.10.0+git20160211.167be93-1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index c2b1b28..1132176 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,8 @@ Build-Depends:
  libtiff5-dev,
  python-all-dev,
  python-nose,
- python-numpy
+ python-numpy,
+ libboost-thread-dev
 Build-Depends-Indep:
  doxygen,
  ghostscript,
diff --git a/debian/rules b/debian/rules
index 0ee0742..c475d5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,12 @@ ifeq ($(DEB_HOST_ARCH),ppc64el)
   CXXFLAGS := $(subst -O3,-O2,$(CXXFLAGS))
 endif
 
+# build with Boost.Thread on armel, see #814606
+ifeq ($(DEB_HOST_ARCH),armel)
+  CMAKE_EXTRAS := -DWITH_BOOST_THREAD=1
+  CXXFLAGS += -std=c++11 # not set by VigraDetectThreading.cmake
+endif
+
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(filter $(DEB_BUILD_ARCH),mips mipsel))
@@ -35,7 +41,8 @@ cmake_options = \
     -DWITH_OPENEXR=ON \
     -DCMAKE_C_FLAGS_RELEASE="$(CFLAGS)" \
     -DCMAKE_CXX_FLAGS_RELEASE="$(CXXFLAGS)" \
-    -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)"
+    -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \
+    $(CMAKE_EXTRAS)
 
 cmake_python_options = \
     -DPYTHON_EXECUTABLE=/usr/bin/python$(1) \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libvigraimpex.git