diff options
| author | Nathan Cutler <presnypreklad@gmail.com> | 2021-03-03 20:44:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 20:44:20 +0100 |
| commit | ef0384dc502ba87549babdb6bcf7d2bc27125a10 (patch) | |
| tree | 769d6c89c1d2f0942a20ef4edbd454eefea489e0 /ceph.spec.in | |
| parent | Merge PR #39682 into master (diff) | |
| parent | rpm: drop old SUSE-specific OOM fix (diff) | |
| download | ceph-ef0384dc502ba87549babdb6bcf7d2bc27125a10.tar.xz ceph-ef0384dc502ba87549babdb6bcf7d2bc27125a10.zip | |
Merge pull request #39765 from smithfarm/wip-ncpus-for-obs
rpm: set build parallelism from memory on SUSE
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Galloway <dgallowa@redhat.com>
Diffstat (limited to 'ceph.spec.in')
| -rw-r--r-- | ceph.spec.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ceph.spec.in b/ceph.spec.in index 906ae08c018..1c6fcac146a 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -293,6 +293,7 @@ BuildRequires: systemd-rpm-macros %{?systemd_requires} PreReq: %fillup_prereq BuildRequires: fdupes +BuildRequires: memory-constraints BuildRequires: net-tools BuildRequires: libbz2-devel BuildRequires: mozilla-nss-devel @@ -1200,8 +1201,7 @@ done %endif %if 0%{?suse_version} -# the following setting fixed an OOM condition we once encountered in the OBS -RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize=32768" +%limit_build -m 2600 %endif export CPPFLAGS="$java_inc" @@ -1284,7 +1284,11 @@ cmake .. \ %if 0%{with rbd_ssd_cache} -DWITH_RBD_SSD_CACHE:BOOL=ON \ %endif +%if 0%{?suse_version} + -DBOOST_J:STRING=%{jobs} \ +%else -DBOOST_J:STRING=%{_smp_build_ncpus} \ +%endif -DWITH_GRAFANA:BOOL=ON %if %{with cmake_verbose_logging} |