X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=48f5b17287bc42c9a4747ecd968bbd4d124d1f45;hp=4f5b05bac8faf7c5653ba44b9671544e654e0d85;hb=ad82976ca7747d004f9dea55e2d2b27460842914;hpb=b498499104af17da081f1c22b9c07951104846a3 diff --git a/lustre.spec.in b/lustre.spec.in index 4f5b05b..48f5b17 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -259,16 +259,6 @@ ln lustre/ChangeLog ChangeLog-lustre ln lnet/ChangeLog ChangeLog-lnet %build -# if RPM_BUILD_NCPUS unset, set it -if [ -z "$RPM_BUILD_NCPUS" ] ; then - RPM_BUILD_NCPUS=$(egrep -c "^cpu[0-9]+" /proc/stat 2>/dev/null || echo 0 :) - if [ $RPM_BUILD_NCPUS -eq 0 ] ; then - RPM_BUILD_NCPUS=1 - fi - if [ $RPM_BUILD_NCPUS -gt 8 ] ; then - RPM_BUILD_NCPUS=8 - fi -fi # Set an explicit path to our Linux tree, if we can. cd $RPM_BUILD_DIR/lustre-%{version} @@ -306,7 +296,7 @@ CONFIGURE_ARGS=$(echo $CONFIGURE_ARGS | sed -e 's/"\?--with-kmp-moddir=[^ ][^ ]* %eval_configure \ %{?kdir: --with-linux=%kdir} %{?kobjdir: --with-linux-obj=%kobjdir} \ $CONFIGURE_ARGS --with-kmp-moddir=%{kmoddir} -make -j $RPM_BUILD_NCPUS -s %{?make_args} +make %{?_smp_mflags} -s %{?make_args} %install make install DESTDIR=$RPM_BUILD_ROOT