[SCM] QtWebKit packaging branch, master, updated. debian/2.3.2.dfsg-2-5-g67da7b4

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=67da7b4

The following commit has been merged in the master branch:
commit 67da7b44893ca4b4fbb250211a8d583ce837df72
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Sep 5 00:26:51 2014 -0300

    Bound CPU usage on unknown platforms.
---
 debian/changelog                     |  2 ++
 debian/patches/bound_cpu_usage.patch | 29 +++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e328db0..6c42bd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ qtwebkit (2.3.2.dfsg-3) UNRELEASED; urgency=medium
     memory.
   * Ensure ppc64el is built in little endian mode with
     Colin Watson's ppc64el.patch.
+  * Bound CPU usage on unknown platforms with bound_cpu_usage.patch
+    (Closes: #760519). Thanks Samuel Thibault for the patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 04 Sep 2014 20:42:51 -0300
 
diff --git a/debian/patches/bound_cpu_usage.patch b/debian/patches/bound_cpu_usage.patch
new file mode 100644
index 0000000..4cc5ddd
--- /dev/null
+++ b/debian/patches/bound_cpu_usage.patch
@@ -0,0 +1,29 @@
+Description: bound CPU usage
+ qtwebkit currently puts hurd buildds on their knees because its
+ build systems uses "make -j", i.e. without specifying the requested
+ parallelism level, which means unbound parallelism, which when building
+ c++ code basically means filling dozens of gigabytes of memory.
+ .
+ This apparently comes from ./Tools/Scripts/webkitdirs.pm which for
+ unknown platforms makes numberOfCPUs() return an empty string, which
+ thus ends up with "make -j".
+ .
+ This patch makes qtwebkit default to 1 instead of defaulting to
+ unbound parallelism.
+Author: Samuel Thibault <sthibault at debian.org>
+Bug-Debian: #760519
+Forwarded: no
+
+--- ./Tools/Scripts/webkitdirs.pm.original	2014-09-05 00:09:09.000000000 +0200
++++ ./Tools/Scripts/webkitdirs.pm	2014-09-05 00:10:34.000000000 +0200
+@@ -362,6 +362,10 @@
+     } elsif (isDarwin() || isFreeBSD()) {
+         chomp($numberOfCPUs = `sysctl -n hw.ncpu`);
+     }
++    if (!defined($numberOfCPUs) or $numberOfCPUs eq "")
++    {
++      $numberOfCPUs = "1";
++    }
+ }
+ 
+ sub jscPath($)
diff --git a/debian/patches/series b/debian/patches/series
index e916ece..e173d43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ fix_nonlinux_glibc_linkage.diff
 double_conversion_correct_double_operations.patch
 reduce_memory_usage.patch
 ppc64el.patch
+bound_cpu_usage.patch

-- 
QtWebKit packaging