0003-avoid-sysctl_h.patch 1.1 KB

12345678910111213141516171819202122232425262728293031
  1. From upstream master branch:
  2. https://github.com/Itseez/opencv/blob/master/modules/core/src/
  3. Do not include sysctl.h targeting Linux systems.
  4. Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
  5. diff -Nur opencv-2.4.12.3.orig/modules/core/src/parallel.cpp opencv-2.4.12.3/modules/core/src/parallel.cpp
  6. --- opencv-2.4.12.3.orig/modules/core/src/parallel.cpp 2015-10-26 08:56:34.000000000 +0100
  7. +++ opencv-2.4.12.3/modules/core/src/parallel.cpp 2016-04-05 12:59:37.750143762 +0200
  8. @@ -56,7 +56,7 @@
  9. #include <sys/types.h>
  10. #if defined ANDROID
  11. #include <sys/sysconf.h>
  12. - #else
  13. + #elif defined __APPLE__
  14. #include <sys/sysctl.h>
  15. #endif
  16. #endif
  17. diff -Nur opencv-2.4.12.3.orig/modules/core/src/system.cpp opencv-2.4.12.3/modules/core/src/system.cpp
  18. --- opencv-2.4.12.3.orig/modules/core/src/system.cpp 2015-10-26 08:56:34.000000000 +0100
  19. +++ opencv-2.4.12.3/modules/core/src/system.cpp 2016-04-05 13:05:22.468323717 +0200
  20. @@ -163,7 +163,7 @@
  21. #include <sys/types.h>
  22. #if defined ANDROID
  23. #include <sys/sysconf.h>
  24. -#else
  25. +#elif defined __APPLE__
  26. #include <sys/sysctl.h>
  27. #endif
  28. #endif