]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: fix for out-of-memory errors in OBS
authorNathan Cutler <ncutler@suse.com>
Fri, 2 Oct 2015 10:15:08 +0000 (12:15 +0200)
committerNathan Cutler <ncutler@suse.com>
Tue, 6 Oct 2015 12:40:41 +0000 (14:40 +0200)
Add "--param ggc-min-expand=20 --param ggc-min-heapsize=32768"
to RPM_OPT_FLAGS, ensuring gcc does not add debug symbols and is
more aggressive about garbage collection.

Thanks to Berthold Gunreben for debugging this issue.

http://tracker.ceph.com/issues/13352 Fixes: #13352

Signed-off-by: Nathan Cutler <ncutler@suse.com>
ceph.spec.in

index a0835b45b94c7f283b2fe92b2cf3deb70718dc87..1b28abcbfe03396468711c9b87789d43e2428ad9 100644 (file)
@@ -4,6 +4,7 @@
 %bcond_with tests
 %bcond_without tcmalloc
 %bcond_without libs_compat
+%bcond_with lowmem_builder
 %if 0%{?fedora} || 0%{?rhel}
 %bcond_without selinux
 %endif
@@ -544,6 +545,9 @@ MY_CONF_OPT="$CEPH_EXTRA_CONFIGURE_ARGS"
 
 MY_CONF_OPT="$MY_CONF_OPT --with-radosgw"
 
+%if %{with lowmem_builder}
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize=32768"
+%endif
 export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
 
 %{configure}   CPPFLAGS="$java_inc" \