diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index f0c7040..5fdf83f 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Feb 2 10:43:48 UTC 2018 - dimstar@opensuse.org + +- Eliminate build dependency on procps: we only used it to run + 'free', in order to find out how much RAM we have available. We + can get this information directly from the kernel, from + /proc/meminfo. + ------------------------------------------------------------------- Fri Jan 12 19:10:53 UTC 2018 - fabian@ritter-vogt.de diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index 7aff20a..974f07d 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -87,7 +87,6 @@ BuildRequires: libgcrypt-devel BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: procps BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} BuildRequires: libqt5-qttools-private-headers-devel >= %{version} @@ -282,12 +281,12 @@ export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / } # processes based on the available memory makeproc="%{?jobs:%{jobs}}" echo "Available memory:" -free +cat /proc/meminfo echo "System limits:" ulimit -a if test -n "$makeproc" -a "$makeproc" -gt 1 ; then - mem_per_process=1300 - max_mem=`LANG=C free -t -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p"` + mem_per_process=1300000 + max_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) max_jobs="$(($max_mem / $mem_per_process))" test "$makeproc" -gt "$max_jobs" && makeproc="$max_jobs" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" test "$makeproc" -le 0 && makeproc=1 && echo "Warning: Do not use the parallel build at all becuse of memory limits"