[SCM] QtWebKit packaging branch, master, updated. debian/2.3.4.dfsg-6-2-gc346b8c
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Sun Apr 3 23:39:22 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=c346b8c
The following commit has been merged in the master branch:
commit c346b8c1a3236f53aaa9a2b8cdf5d51beaed78ae
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Sun Apr 3 20:38:30 2016 -0300
Bound the number of CPUs used to compile on KFreeBSD.
Thanks Jon Boden.
---
debian/changelog | 4 ++++
debian/patches/fix_number_of_cpus_in_kfreebsd.diff | 28 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 33 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index bcc085a..3e63363 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
qtwebkit (2.3.4.dfsg-7) UNRELEASED; urgency=medium
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Add fix_number_of_cpus_in_kfreebsd.diff to bound the number of CPUs used
+ to compile webkit on KFreeBSD (Closes: #819868). Thanks Jon Boden!
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 03 Apr 2016 20:33:19 -0300
qtwebkit (2.3.4.dfsg-6) unstable; urgency=medium
diff --git a/debian/patches/fix_number_of_cpus_in_kfreebsd.diff b/debian/patches/fix_number_of_cpus_in_kfreebsd.diff
new file mode 100644
index 0000000..daac8f2
--- /dev/null
+++ b/debian/patches/fix_number_of_cpus_in_kfreebsd.diff
@@ -0,0 +1,28 @@
+Description: Bound the number of CPUs used to compile on KFreeBSD.
+Author: Jon Boden <jon at ubuntubsd.org>
+
+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\-]/);
diff --git a/debian/patches/series b/debian/patches/series
index 9adc933..5b09448 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ fix_nonlinux_glibc_linkage.diff
reduce_memory_usage.patch
explicit_template_instantiation.patch
redeclare_uint32_t_for_sparc64.patch
+fix_number_of_cpus_in_kfreebsd.diff
--
QtWebKit packaging
More information about the pkg-kde-commits
mailing list