[opencv] 09/11: Fix i686 build

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch for-3.1.0
in repository opencv.

commit e364f5242f795c084f8c25f1d11ce79dbab58778
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jul 18 16:23:00 2016 +0200

    Fix i686 build
---
 debian/patches/optimize_i586.patch | 22 ----------------------
 debian/patches/series              |  1 -
 debian/rules                       |  2 +-
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/debian/patches/optimize_i586.patch b/debian/patches/optimize_i586.patch
deleted file mode 100644
index 2e64587..0000000
--- a/debian/patches/optimize_i586.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Optimize of i386 changed from 686 to 586.
- Similar to the patch patches/0011_optimize_i486.patch in wheezy
- by Nobuhiro Iwamatsu.
- Upstream moved the location from CMakeLists.txt to cmake/OpenCVCompilerOptions.cmake.
-Author: Bernhard Übelacker <bernhardu at vr-web.de>
-Bug-Debian: https://bugs.debian.org/784647
-Origin: other, https://sources.debian.net/src/opencv/2.3.1-11%2Bdeb7u1/debian/patches/0011_optimize_i486.patch/
-Last-Update: 2016-01-07
-
-Index: opencv/cmake/OpenCVCompilerOptions.cmake
-===================================================================
---- opencv.orig/cmake/OpenCVCompilerOptions.cmake
-+++ opencv/cmake/OpenCVCompilerOptions.cmake
-@@ -119,7 +119,7 @@
-   endif()
- 
-   if(X86 AND NOT MINGW64 AND NOT X86_64 AND NOT APPLE)
--    add_extra_compiler_option(-march=i686)
-+    add_extra_compiler_option(-march=i586)
-   endif()
- 
-   if(APPLE)
diff --git a/debian/patches/series b/debian/patches/series
index ce6714d..a22289d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,4 @@ support_multiarch
 #revert-Make-ts-always-static
 #fix_path_of_opencl_headers
 #libav10.patch
-optimize_i586.patch
 support_x32
diff --git a/debian/rules b/debian/rules
index 5dacf6a..41ae17b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 # for i386 arch
 ifeq ($(DEB_HOST_ARCH),i386)
-BUILDDIR_ARCH = i586-linux-gnu
+BUILDDIR_ARCH = i686-linux-gnu
 else
 BUILDDIR_ARCH = $(DEB_HOST_MULTIARCH)
 endif

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