[opencv] 04/11: tbb is now available in all linux architectures, so enable it for all linux-any

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository opencv.

commit f67996abf4163cf2917914b770053b5834cb4a2b
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Oct 16 22:20:05 2017 +0200

    tbb is now available in all linux architectures, so enable it for all linux-any
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/control |  4 ++--
 debian/rules   | 11 ++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index ccefdaa..0352ebd 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Build-Depends:
  libprotobuf-dev,
  libraw1394-dev [linux-any],
  libswscale-dev,
- libtbb-dev [i386 amd64 ia64 powerpc ppc64 ppc64el],
+ libtbb-dev [linux-any],
  libtesseract-dev,
  libtiff-dev,
  libv4l-dev [linux-any],
@@ -156,7 +156,7 @@ Architecture: any
 Multi-Arch: same
 Depends:
  libopencv-core3.2 (= ${binary:Version}),
- libtbb-dev [i386 amd64 ia64 powerpc ppc64 ppc64el],
+ libtbb-dev [linux-any],
  zlib1g-dev,
  ${misc:Depends},
 Description: development files for libopencv-core3.2
diff --git a/debian/rules b/debian/rules
index ab98d29..9154d96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,18 +14,11 @@ else
 CMAKE_ARCH_FLAGS = -DENABLE_SSE=OFF -DENABLE_SSE2=OFF -DENABLE_SSE3=OFF
 endif
 
-# TBB support
-ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 ia64 powerpc ppc64 ppc64el))
-CMAKE_ARCH_FLAGS += -DWITH_TBB=ON
-else
-CMAKE_ARCH_FLAGS += -DWITH_TBB=OFF
-endif
-
 # Linux-specific stuff
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-CMAKE_ARCH_FLAGS += -DWITH_1394=ON -DWITH_V4L=ON
+CMAKE_ARCH_FLAGS += -DWITH_1394=ON -DWITH_V4L=ON -DWITH_TBB=ON
 else
-CMAKE_ARCH_FLAGS += -DWITH_1394=OFF -DWITH_V4L=OFF
+CMAKE_ARCH_FLAGS += -DWITH_1394=OFF -DWITH_V4L=OFF -DWITH_TBB=OFF
 endif
 
 # For Java

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