commit llvm4 for openSUSE:Factory

31 Jan 2018

Hello community,

here is the log from the commit of package llvm4 for openSUSE:Factory checked in at 2018-01-31 19:54:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/llvm4 (Old)
 and      /work/SRC/openSUSE:Factory/.llvm4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "llvm4"

Wed Jan 31 19:54:31 2018 rev:14 rq:571409 version:4.0.1

Changes:
--------

--- /work/SRC/openSUSE:Factory/llvm4/llvm4.changes	2018-01-25 12:40:03.676006217 +0100
+++ /work/SRC/openSUSE:Factory/.llvm4.new/llvm4.changes	2018-01-31 19:54:36.433900203 +0100
@@ -1,0 +2,20 @@
+Wed Jan 31 08:48:48 UTC 2018 - msrb@suse.com
+
+- Cleanup %ifarch conditions, remove targets unintentionally added
+  to s390/s390x. (bnc#1078436)
+
+-------------------------------------------------------------------
+Tue Jan 30 09:24:22 UTC 2018 - msrb@suse.com
+
+- Limit the amount of parallel link jobs, but no longer limit
+  compile jobs. This should prevent running out of memory during
+  linking while not longer slowing down compilation.
+- Remove build dependency on procps
+
+-------------------------------------------------------------------
+Mon Jan 29 12:17:55 UTC 2018 - msrb@suse.com
+
+- Reduce disk size requirement to 30GB in _constraints. We no
+  longer need that much since we stopped building static libraries.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ llvm4.spec ++++++
--- /var/tmp/diff_new_pack.XFMWRh/_old	2018-01-31 19:54:38.633797894 +0100
+++ /var/tmp/diff_new_pack.XFMWRh/_new	2018-01-31 19:54:38.641797523 +0100
@@ -106,7 +106,6 @@
 BuildRequires:  ncurses-devel
 BuildRequires:  ninja
 BuildRequires:  pkgconfig
-BuildRequires:  procps
 BuildRequires:  python3
 BuildRequires:  pkgconfig(libedit)
 BuildRequires:  pkgconfig(zlib)
@@ -567,32 +566,35 @@
 %ifarch armv7hl
 flags+=" -mfloat-abi=hard -march=armv7-a -mtune=cortex-a15 -mfpu=vfpv3-d16"
 %endif
-%ifarch %{ix86} x86_64
+
+# By default build everything
 TARGETS_TO_BUILD="all"
-%else
 %ifarch s390 s390x
 # No graphics cards on System z
 TARGETS_TO_BUILD="host;BPF"
 %endif
 %ifarch %arm
+# TODO: Document why those.
 TARGETS_TO_BUILD="host;ARM;AMDGPU;BPF;NVPTX"
-%else
-TARGETS_TO_BUILD="host;AMDGPU;BPF;NVPTX"
 %endif
+%ifarch ppc64 ppc64le
+# TODO: Document why those.
+TARGETS_TO_BUILD="host;AMDGPU;BPF;NVPTX"
 %endif
 
 # do not eat all memory
-ninjaproc="%{?jobs:%{jobs}}"
+max_link_jobs="%{?jobs:%{jobs}}"
+max_compile_jobs="%{?jobs:%{jobs}}"
 echo "Available memory:"
-free
+cat /proc/meminfo
 echo "System limits:"
 ulimit -a
-if test -n "$ninjaproc" -a "$ninjaproc" -gt 1 ; then
-    mem_per_process=2000
-    max_mem=`LANG=C free -t -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p"`
+if test -n "$max_link_jobs" -a "$max_link_jobs" -gt 1 ; then
+    mem_per_process=2000000
+    max_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo)
     max_jobs="$(($max_mem / $mem_per_process))"
-    test "$ninjaproc" -gt "$max_jobs" && ninjaproc="$max_jobs" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits"
-    test "$ninjaproc" -le 0 && ninjaproc=1 && echo "Warning: Do not use the parallel build at all becuse of memory limits"
+    test "$max_link_jobs" -gt "$max_jobs" && max_link_jobs="$max_jobs" && echo "Warning: Reducing number of link jobs to $max_jobs because of memory limits"
+    test "$max_link_jobs" -le 0 && max_link_jobs=1 && echo "Warning: Not linking in parallel at all becuse of memory limits"
 fi
 
 %if 0%{?sle_version} && 0%{?sle_version} <= 130000
@@ -610,6 +612,8 @@
     -DLLVM_LINK_LLVM_DYLIB:BOOL=OFF \
     -DCMAKE_C_FLAGS="$flags" \
     -DCMAKE_CXX_FLAGS="$flags" \
+    -DLLVM_PARALLEL_COMPILE_JOBS="$max_compile_jobs" \
+    -DLLVM_PARALLEL_LINK_JOBS="$max_link_jobs" \
     -DENABLE_LINKER_BUILD_ID=ON \
     -DLLVM_OPTIMIZED_TABLEGEN:BOOL=ON \
     -DLLVM_BUILD_TOOLS:BOOL=OFF \
@@ -631,7 +635,7 @@
     -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-keep-memory" \
     -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-keep-memory" \
     -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3
-ninja -v -j $ninjaproc clang
+ninja -v %{?_smp_mflags} clang
 cd ..
 
 %define __builddir build
@@ -648,6 +652,8 @@
     -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
     -DCMAKE_C_FLAGS="$flags" \
     -DCMAKE_CXX_FLAGS="$flags" \
+    -DLLVM_PARALLEL_COMPILE_JOBS="$max_compile_jobs" \
+    -DLLVM_PARALLEL_LINK_JOBS="$max_link_jobs" \
 %ifarch %{arm} s390 %{ix86}
     -DCMAKE_C_FLAGS_RELWITHDEBINFO="-O2 -g1 -DNDEBUG" \
     -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O2 -g1 -DNDEBUG" \
@@ -676,7 +682,7 @@
     -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--build-id=sha1" \
     -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--build-id=sha1" \
     -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3
-ninja -v -j $ninjaproc
+ninja -v %{?_smp_mflags}
 cd ..
 
 %if !0%{?sle_version}

++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.XFMWRh/_old	2018-01-31 19:54:38.693795104 +0100
+++ /var/tmp/diff_new_pack.XFMWRh/_new	2018-01-31 19:54:38.693795104 +0100
@@ -2,7 +2,7 @@
 <constraints>
   <hardware>
     <disk>
-      <size unit="G">45</size>
+      <size unit="G">30</size>
     </disk>
     <memory>
       <size unit="M">6500</size>

    

root＠hilbert.suse.de

tags

participants (1)