diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-12-13 18:23:55 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-12-13 18:23:55 -0700 |
| commit | e842d46efa151e00e0998a3ad65f9c99b2e18519 (patch) | |
| tree | 5ab0647c2a5502b00ddbacef80efb01f9985737b /Build-tools | |
| parent | 123946665cd437eb9249b500d710b4a5fcab39bc (diff) | |
| download | mariadb-git-e842d46efa151e00e0998a3ad65f9c99b2e18519.tar.gz | |
fixes for parallel make, re-added the lost README files in mysql-test
BUILD/compile-pentium-debug:
fox for parallel make
BUILD/compile-pentium-gcov:
fix for parallel make
BUILD/compile-pentium:
fix to enable parallel make when recursing to subdirectories
Build-tools/Do-all-build-steps:
fix for parallel make, remove the stale comment to make Tim happy
Build-tools/Do-rpm:
fix for parallel make
Diffstat (limited to 'Build-tools')
| -rwxr-xr-x | Build-tools/Do-all-build-steps | 8 | ||||
| -rwxr-xr-x | Build-tools/Do-rpm | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Build-tools/Do-all-build-steps b/Build-tools/Do-all-build-steps index ba6b93672ed..d52aeb4f18c 100755 --- a/Build-tools/Do-all-build-steps +++ b/Build-tools/Do-all-build-steps @@ -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 diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm index f1847604840..e480a6f8344 100755 --- a/Build-tools/Do-rpm +++ b/Build-tools/Do-rpm @@ -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;);;'` |