diff --git a/bash.spec b/bash.spec index 0521da09..33e4bf7b 100644 --- a/bash.spec +++ b/bash.spec @@ -21,6 +21,8 @@ %else %bcond_without alternatives %endif +# Parallel builds do not work! +%global _smp_mflags -j1 %define bextend %{nil} %define bversion 5.1 @@ -224,13 +226,12 @@ Legacy usrmove helper files for the build system. Do not install. %prep %if %{with sjis} -echo -e '\033[1m\033[31mWarning: Shift JIS support is enabled\033[m' +%{warn:Shift JIS support is enabled} %else -echo -e '\033[1m\032[31mShift JIS support disabled\033[m' +%{echo:Shift JIS support disabled} %endif %setup -q -n bash-%{bversion}%{bextend} -b1 typeset -i level -set +x for patch in ../bash-%{bversion}-patches/*-*[0-9]; do test -e $patch || break @@ -245,7 +246,6 @@ for patch in ../bash-%{bversion}-patches/*-*[0-9]; do echo Patch $patch patch -s -p$level < $patch done -set -x %patch1 -b .manual %patch3 -b .2.4.4 %patch4 -b .evalexp @@ -452,23 +452,23 @@ test ${rl1[2]} = ${rl2[2]} || exit 1 profilecflags=CFLAGS="$CFLAGS %{cflags_profile_generate}" %endif makeopts="Machine=${HOSTTYPE} OS=${OSTYPE} VENDOR=${VENDOR} MACHTYPE=${MACHTYPE}" - make $makeopts "$profilecflags" \ + %make_build $makeopts "$profilecflags" \ all printenv recho zecho xcase TMPDIR=$(mktemp -d /tmp/bash.XXXXXXXXXX) || exit 1 > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! env -i HOME=$PWD TERM=$TERM LD_LIBRARY_PATH=$LD_RUN_PATH TMPDIR=$TMPDIR \ SCREENRC=$SCREENRC SCREENDIR=$SCREENDIR \ - screen -D -m make TESTSCRIPT=%{SOURCE4} check + screen -D -m %make_build TESTSCRIPT=%{SOURCE4} check kill -TERM $pid %if 0%{?do_profiling} rm -f jobs.gcda profilecflags=CFLAGS="$CFLAGS %{cflags_profile_feedback} -fprofile-correction" clean=clean %endif - make $makeopts "$profilecflags" $clean all - make $makeopts -C examples/loadables/ - make $makeopts documentation + %make_build $makeopts "$profilecflags" $clean all + %make_build $makeopts -C examples/loadables/ + %make_build $makeopts documentation %install %make_install