Bug#819868: qtwebkit: Make determineNumberOfCPUs work on kfreebsd
Package: qtwebkit
Version: 2.3.4.dfsg-6
Severity: wishlist
Tags: patch
Hi
Please could you apply this tiny patch? It makes determineNumberOfCPUs work on kfreebsd.
Note1: This is more relevant than it seems. I recall seeing some build system (not sure if qtwebkit itself or something else) spawning an unlimited offspring of gcc processes (~50) when this routine fails.
Note2: This is the old version of the patch for qtwebkit 2.3.4. A slightly different version has already been sent upstream.
Thanks!
--
Jon Boden
ubuntuBSD -- The power of FreeBSD kernel with familiarity of Ubuntu OS!
http://www.ubuntubsd.org/ -- https://twitter.com/ubuntuBSD
Index: Tools/Scripts/webkitdirs.pm
===================================================================
--- Tools/Scripts/webkitdirs.pm (revision 198974)
+++ Tools/Scripts/webkitdirs.pm (working copy)
@@ -409,7 +409,7 @@
} elsif (isAnyWindows()) {
# Assumes cygwin
$numberOfCPUs = `ls /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor | wc -w`;
- } elsif (isDarwin() || isFreeBSD()) {
+ } elsif (isDarwin() || isFreeBSD() || isKernelFreeBSD()) {
chomp($numberOfCPUs = `sysctl -n hw.ncpu`);
}
}
@@ -1216,6 +1216,11 @@
return ($^O eq "freebsd") || ($^O eq "openbsd") || ($^O eq "netbsd") || 0;
}
+sub isKernelFreeBSD()
+{
+ return isFreeBSD() || ($^O eq "gnukfreebsd") || 0;
+}
+
sub isARM()
{
return ($Config{archname} =~ /^arm[v\-]/) || ($Config{archname} =~ /^aarch64[v\-]/);
Reply to: