[opencv] 02/05: We need the latest tbb which is available only on few architectures
Mattia Rizzolo
mattia at debian.org
Tue Oct 17 14:21:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch sid
in repository opencv.
commit 810571e71497e304d8c021ce5ad6b4b63acc20d5
Author: Mattia Rizzolo <mattia at debian.org>
Date: Tue Oct 17 13:04:54 2017 +0200
We need the latest tbb which is available only on few architectures
Revert back to explicitly listing architectures where tbb is available.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
debian/control | 4 ++--
debian/rules | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index c1eee04..e6739cf 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 [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x powerpc powerpcspe ppc64 sh4 sparc64],
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 [amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x powerpc powerpcspe ppc64 sh4 sparc64],
zlib1g-dev,
${misc:Depends},
Description: development files for libopencv-core3.2
diff --git a/debian/rules b/debian/rules
index 5593da7..9b973b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ 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))
+ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x powerpc powerpcspe ppc64 sh4 sparc64))
CMAKE_ARCH_FLAGS += -DWITH_TBB=ON
else
CMAKE_ARCH_FLAGS += -DWITH_TBB=OFF
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git
More information about the debian-science-commits
mailing list