r46241 - /packages/opencv/trunk/debian/patches/fix_ftbfs_on_non_linux.patch

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Wed Sep  4 00:45:34 2013
New Revision: 46241

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46241
Log:
Add fix_ftbfs_on_non_linux.patch

Added:
    packages/opencv/trunk/debian/patches/fix_ftbfs_on_non_linux.patch

Added: packages/opencv/trunk/debian/patches/fix_ftbfs_on_non_linux.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/opencv/trunk/debian/patches/fix_ftbfs_on_non_linux.patch?rev=46241&op=file
==============================================================================
--- packages/opencv/trunk/debian/patches/fix_ftbfs_on_non_linux.patch	(added)
+++ packages/opencv/trunk/debian/patches/fix_ftbfs_on_non_linux.patch	Wed Sep  4 00:45:34 2013
@@ -0,0 +1,50 @@
+Description: Fix FTBFS on non linux
+Forwarded: not yet
+Author: Pino Toscano <pino at debian.org>
+Last-Update: 2013-09-04
+
+--- a/modules/core/src/system.cpp
++++ b/modules/core/src/system.cpp
+@@ -93,13 +93,13 @@
+ 
+ #include <stdarg.h>
+ 
+-#if defined __linux__ || defined __APPLE__
++#if defined __linux__ || defined __APPLE__ || defined __GLIBC__
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <sys/types.h>
+ #if defined ANDROID
+ #include <sys/sysconf.h>
+-#else
++#elif !defined __GNU__
+ #include <sys/sysctl.h>
+ #endif
+ #endif
+--- a/modules/core/src/parallel.cpp
++++ b/modules/core/src/parallel.cpp
+@@ -50,13 +50,13 @@
+     #undef abs
+ #endif
+ 
+-#if defined __linux__ || defined __APPLE__
++#if defined __linux__ || defined __APPLE__ || defined __GLIBC__
+     #include <unistd.h>
+     #include <stdio.h>
+     #include <sys/types.h>
+     #if defined ANDROID
+         #include <sys/sysconf.h>
+-    #else
++    #elif !defined __GNU__
+         #include <sys/sysctl.h>
+     #endif
+ #endif
+@@ -451,7 +451,7 @@ int cv::getNumberOfCPUs(void)
+ #elif defined ANDROID
+     static int ncpus = getNumberOfCPUsImpl();
+     return ncpus;
+-#elif defined __linux__
++#elif defined __linux__ || defined __GLIBC__
+     return (int)sysconf( _SC_NPROCESSORS_ONLN );
+ #elif defined __APPLE__
+     int numCPU=0;