Commit 7c8773d9 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

fixes for parallel make, re-added the lost README files in mysql-test

parent 57c65749

BUILD/compile-pentium

+1 −0
Original line number Diff line number Diff line 
AM_MAKEFLAGS="-j 2"

make -k clean

/bin/rm -f */.deps/*.P config.cache

BUILD/compile-pentium-debug

+1 −0
Original line number Diff line number Diff line 
AM_MAKEFLAGS="-j 2"

make -k clean

/bin/rm -f */.deps/*.P config.cache

BUILD/compile-pentium-gcov

+1 −0
Original line number Diff line number Diff line 
AM_MAKEFLAGS="-j 2"

make -k clean

/bin/rm -f */.deps/*.P config.cache

Build-tools/Do-all-build-steps

+4 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ to_host=`hostname` 
cc=gcc

ccc=gcc

EXTRA_CONFIG="--without-perl"



AM_MAKEFLAGS="-j 2"

echo "Building on $to_host"



rm -rf $BD/*
@@ -34,7 +34,7 @@ umask 002 
CC=$cc CXX=$ccc 

export CC CXX



gmake -k distclean

gmake -j 2 -k distclean

rm -f NEW-RPMS/*



# Stop on error
@@ -61,9 +61,9 @@ aclocal; autoheader; aclocal; automake; autoconf 
 --enable-thread-safe-client \

 --without-berkeley-db



gmake -j 2 # --jobs=4 does not work.

gmake -j 2 .



time gmake distcheck \

time gmake -j 2 distcheck \

 EXTRA_CONF_ARGS="--with-unix-socket-path=/var/tmp/mysql.sock --with-low-memory $EXTRA_CONFIG"



sh $BD/Build-tools/Do-rpm

Build-tools/Do-rpm

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ DBD_MYSQL_VERSION="1.2209" 
MAKERPM="$rpmdir/SOURCES/makerpm.pl"



#######################

AM_MAKEFLAGS="-j 2"



VER=`grep "AM_INIT_AUTOMAKE(mysql, " $bpath/configure.in | \

 sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;'`