[opencv] 02/11: d/p/fix_ftbfs_on_non_linux: simplify patch, by removing several hunks no longer needed

[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 28da04a82b16d33a5ccbd02cc9022acfafc5fde9
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Oct 16 19:20:09 2017 +0200

    d/p/fix_ftbfs_on_non_linux: simplify patch, by removing several hunks no longer needed
    
    Incidentally, this fixes the FTBFS in x32
    
    Closes: #878705
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/patches/fix_ftbfs_on_non_linux | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/debian/patches/fix_ftbfs_on_non_linux b/debian/patches/fix_ftbfs_on_non_linux
index 8cb1814..95a18e5 100644
--- a/debian/patches/fix_ftbfs_on_non_linux
+++ b/debian/patches/fix_ftbfs_on_non_linux
@@ -3,11 +3,9 @@ Forwarded: not yet
 Author: Pino Toscano <pino at debian.org>
 Last-Update: 2017-05-09
 
-diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp
-index 71ac94eec8..c36911377d 100644
 --- a/modules/core/src/parallel.cpp
 +++ b/modules/core/src/parallel.cpp
-@@ -50,13 +50,13 @@
+@@ -50,7 +50,7 @@
      #undef abs
  #endif
  
@@ -16,14 +14,7 @@ index 71ac94eec8..c36911377d 100644
      #include <unistd.h>
      #include <stdio.h>
      #include <sys/types.h>
-     #if defined ANDROID
-         #include <sys/sysconf.h>
--    #elif defined __APPLE__
-+    #elif defined __APPLE__ || !defined __GNU__
-         #include <sys/sysctl.h>
-     #endif
- #endif
-@@ -562,7 +562,7 @@ int cv::getNumberOfCPUs(void)
+@@ -562,7 +562,7 @@
  #elif defined ANDROID
      static int ncpus = getNumberOfCPUsImpl();
      return ncpus;
@@ -32,11 +23,9 @@ index 71ac94eec8..c36911377d 100644
      return (int)sysconf( _SC_NPROCESSORS_ONLN );
  #elif defined __APPLE__
      int numCPU=0;
-diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
-index 3c8f39d74b..6264dd6da6 100644
 --- a/modules/core/src/system.cpp
 +++ b/modules/core/src/system.cpp
-@@ -198,12 +198,14 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
+@@ -198,7 +198,7 @@
  
  #include <stdarg.h>
  
@@ -45,10 +34,3 @@ index 3c8f39d74b..6264dd6da6 100644
  #include <unistd.h>
  #include <stdio.h>
  #include <sys/types.h>
- #if defined ANDROID
- #include <sys/sysconf.h>
-+#elif !defined __GNU__
-+#include <sys/sysctl.h>
- #endif
- #endif
- 

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