diff --git a/PrusaSlicer.changes b/PrusaSlicer.changes index 26cddb4..b81fe23 100644 --- a/PrusaSlicer.changes +++ b/PrusaSlicer.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Aug 20 15:50:07 UTC 2020 - Benjamin Greiner + +- revert the memoryperjob change. The build process really acquires + that much memory per job and the workers cannot provide 3GB per + CPU core. Sadly, we are limited by memory not by CPU cores. +- require 11 GB of RAM. This allows us to run 3 jobs in parallel and + can be provided by all architectures + +------------------------------------------------------------------- +Thu Aug 20 09:03:33 UTC 2020 - Martin Liška + +- Use memoryperjob constraint instead of %limit_build macro. +- Use only 1GB for memoryperjob. + ------------------------------------------------------------------- Mon Aug 10 08:12:10 UTC 2020 - Stefan Brüns diff --git a/PrusaSlicer.spec b/PrusaSlicer.spec index a0b4983..ef4d548 100644 --- a/PrusaSlicer.spec +++ b/PrusaSlicer.spec @@ -67,7 +67,13 @@ It also works with Mach3, LinuxCNC and Machinekit controllers. sed -i 's/UNKNOWN/OpenSUSE/' version.inc %build -%limit_build -m 4096 +# The build process really acquires that much memory per job. We are +# limited by memory not by CPU cores. Using memoryperjob in _constraints cannot +# provide any workers on some architectures. This is still better than not using +# parallel building at all. +# https://openbuildservice.org/help/manuals/obs-user-guide/cha.obs.build_job_constraints.html +# https://en.opensuse.org/openSUSE:Specfile_guidelines#Parallel_make +%limit_build -m 3072 # sse2 flags for 32-bit: see gh#prusa3d/PrusaSlicer#3781 %ifarch %ix86 export CFLAGS="%optflags -mfpmath=sse -msse2" diff --git a/_constraints b/_constraints index cbb4c6b..7368f17 100644 --- a/_constraints +++ b/_constraints @@ -1,10 +1,11 @@ + 12 - - 8 - + + 11 +