diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-09-24 16:38:59 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-09-24 16:39:52 +0200 |
| commit | 635b86e7ec1694315ddf3b3db675b25f2ab5ec16 (patch) | |
| tree | b25cef544858a72d0df3a94b3991b68080c3e265 /main/xulrunner/get_nproc.patch | |
| parent | 7dd6bfbca5cd07bc6656ba25d546367c76bf7908 (diff) | |
| download | aports-635b86e7ec1694315ddf3b3db675b25f2ab5ec16.tar.bz2 aports-635b86e7ec1694315ddf3b3db675b25f2ab5ec16.tar.xz | |
main/xulrunner: upgrade to 24.0
Diffstat (limited to 'main/xulrunner/get_nproc.patch')
| -rw-r--r-- | main/xulrunner/get_nproc.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/main/xulrunner/get_nproc.patch b/main/xulrunner/get_nproc.patch new file mode 100644 index 0000000000..3e58a9a001 --- /dev/null +++ b/main/xulrunner/get_nproc.patch @@ -0,0 +1,29 @@ +--- ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc.orig 2013-09-17 09:50:51.299150776 +0200 ++++ ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc 2013-09-17 10:16:45.749663438 +0200 +@@ -17,7 +17,7 @@ + #include <sys/sysctl.h> + #elif defined(WEBRTC_ANDROID) + // Not implemented yet, might be possible to use Linux implementation +-#elif defined(WEBRTC_LINUX) ++#elif defined(WEBRTC_LINUX) && !defined(__UCLIBC__) + #include <sys/sysinfo.h> + #else // defined(_SC_NPROCESSORS_ONLN) + #include <unistd.h> +@@ -38,7 +38,7 @@ + WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, + "Available number of cores:%d", number_of_cores_); + +-#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK) ++#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK) && !defined(__UCLIBC__) + number_of_cores_ = get_nprocs(); + WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, + "Available number of cores:%d", number_of_cores_); +@@ -64,7 +64,7 @@ + number_of_cores_ = 1; + } + #elif defined(_SC_NPROCESSORS_ONLN) +- _numberOfCores = sysconf(_SC_NPROCESSORS_ONLN); ++ number_of_cores_ = sysconf(_SC_NPROCESSORS_ONLN); + #else + WEBRTC_TRACE(kTraceWarning, kTraceUtility, -1, + "No function to get number of cores"); |