diff options
| author | tnn <tnn> | 2011-11-27 13:09:00 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2011-11-27 13:09:00 +0000 |
| commit | 0bb8f870e77989415ac6bc0fb501eb8f7c266290 (patch) | |
| tree | 82d21f4cfd37681c2ceb8c37b97483abce9310e9 /www/seamonkey | |
| parent | b23da8e48a8a033a88970d46508d2a1440a2be68 (diff) | |
| download | pkgsrc-0bb8f870e77989415ac6bc0fb501eb8f7c266290.tar.gz | |
Work around lack of _SC_NPROCESSORS_ONLN on some platforms (like netbsd4).
Observed in PR pkg/45553.
Diffstat (limited to 'www/seamonkey')
| -rw-r--r-- | www/seamonkey/distinfo | 4 | ||||
| -rw-r--r-- | www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc | 18 |
2 files changed, 17 insertions, 5 deletions
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index a665ab59327..9f41a947101 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.69 2011/11/12 16:41:43 tnn Exp $ +$NetBSD: distinfo,v 1.70 2011/11/27 13:09:00 tnn Exp $ SHA1 (seamonkey-2.5b4.source.tar.bz2) = 74b8b9a415b97e4e3242db516fa57ed8b9f43dfe RMD160 (seamonkey-2.5b4.source.tar.bz2) = 1ed9a59457b7bafe2aed2071908822b98225dddc @@ -39,7 +39,7 @@ SHA1 (patch-ipc_chromium_src_base_file__util.h) = 51dc4a5a32da8e7d7eb3c026e3ebaa SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = ce60e80e3ddc417c1fa867f6f4258aece166fc51 SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = 3c83eeb7f40416b61a799ca55b223a93353f7f6a SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 0c493e4ae0e8ce5c65577667bb301ffa1ac60b5c -SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 2dc6cd2bac4bc45406709090369f2901090d855f +SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = b48db50737a961b1dce9f8a212a81eb393b7bf83 SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 648804b5b2cccba36ac14e693f5dac16c55dcb32 SHA1 (patch-ipc_chromium_src_build_build__config.h) = be592fd638b42f1a34a7b01827c2ca59f225144b SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 202f215aa78b3325b1ea1d68be5b49d46bc10dd0 diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc b/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc index 912548bda3c..0ecbd70ec2a 100644 --- a/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc +++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.1 2011/07/11 20:46:36 tnn Exp $ +$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.2 2011/11/27 13:09:00 tnn Exp $ ---- mozilla/ipc/chromium/src/base/sys_info_posix.cc.orig 2011-06-15 21:57:27.000000000 +0000 +--- mozilla/ipc/chromium/src/base/sys_info_posix.cc.orig 2011-11-04 21:34:00.000000000 +0000 +++ mozilla/ipc/chromium/src/base/sys_info_posix.cc @@ -18,6 +18,11 @@ #include <mach/mach_init.h> @@ -14,7 +14,19 @@ $NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.1 2011/07/11 20:46: #include "base/logging.h" #include "base/string_util.h" -@@ -52,6 +57,20 @@ int64 SysInfo::AmountOfPhysicalMemory() +@@ -26,7 +31,11 @@ namespace base { + int SysInfo::NumberOfProcessors() { + // It seems that sysconf returns the number of "logical" processors on both + // mac and linux. So we get the number of "online logical" processors. ++#ifdef _SC_NPROCESSORS_ONLN + static long res = sysconf(_SC_NPROCESSORS_ONLN); ++#else ++ static long res = 1; ++#endif + if (res == -1) { + NOTREACHED(); + return 1; +@@ -52,6 +61,20 @@ int64 SysInfo::AmountOfPhysicalMemory() } return static_cast<int64>(hostinfo.max_mem); |