rpm/libqt5-qtwebengine
SHA256
1
0
Fork 0
forked from pool/libqt5-qtwebengine
Code Pull Requests Activity

Accepting request 572295 from KDE:Qt5

Browse Source 
- 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.

OBS-URL: https://build.opensuse.org/request/show/572295
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=30
This commit is contained in:
Dominique Leuenberger 2018-02-06 15:41:21 +00:00 committed by Git OBS Bridge
parent c1765aba79
commit 8ee8f51abd
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libqt5-qtwebengine.changes
View File

@ -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 Fri Jan 12 19:10:53 UTC 2018 - fabian@ritter-vogt.de

7
libqt5-qtwebengine.spec
View File

@ -87,7 +87,6 @@ BuildRequires: libgcrypt-devel
BuildRequires: libicu-devel BuildRequires: libicu-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: procps
BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} BuildRequires: libqt5-qtbase-private-headers-devel >= %{version}
BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version}
BuildRequires: libqt5-qttools-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 # processes based on the available memory
makeproc="%{?jobs:%{jobs}}" makeproc="%{?jobs:%{jobs}}"
echo "Available memory:" echo "Available memory:"
free cat /proc/meminfo
echo "System limits:" echo "System limits:"
ulimit -a ulimit -a
if test -n "$makeproc" -a "$makeproc" -gt 1 ; then if test -n "$makeproc" -a "$makeproc" -gt 1 ; then
mem_per_process=1300 mem_per_process=1300000
max_mem=`LANG=C free -t -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p"` max_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo)
max_jobs="$(($max_mem / $mem_per_process))" 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" -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" test "$makeproc" -le 0 && makeproc=1 && echo "Warning: Do not use the parallel build at all becuse of memory limits"