diff options
author | unknown <lenz@mysql.com> | 2002-05-15 11:06:44 +0200 |
---|---|---|
committer | unknown <lenz@mysql.com> | 2002-05-15 11:06:44 +0200 |
commit | dcdb2a57902877bde6b5958825a29950019c2755 (patch) | |
tree | 5325913f53f6cbe83961b41466be6e64c99af64d /Build-tools | |
parent | 258718ad24b18abc7ddd189efec54eb732c2a4b6 (diff) | |
download | mariadb-git-dcdb2a57902877bde6b5958825a29950019c2755.tar.gz |
Fixed sql_yacc.yy to be compatible with bison 1.31 and above.
Made detection of GNU tar a bit more flexible.
Only use /usr/local/mysql-glibc if it actually exists
Build-tools/Do-linux-build:
Only use the "--with-other-libc" parameter, if another libc actually
exists at this location
Makefile.am:
Removed hard-coded tar binary name
configure.in:
Added check for GNU tar with various names
sql/sql_yacc.yy:
Added semicolons to several expressions to make bison 1.31 and above
happy when used in Yacc compatibility mode. From the bison NEWS:
"Bison has always permitted actions such as { $$ = $1 }: it adds the
ending semicolon. Now if in Yacc compatibility mode, the semicolon
is no longer output: one has to write { $$ = $1; }."
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'Build-tools')
-rwxr-xr-x | Build-tools/Do-linux-build | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Build-tools/Do-linux-build b/Build-tools/Do-linux-build index e5b0a49fe75..7a1fc426a30 100755 --- a/Build-tools/Do-linux-build +++ b/Build-tools/Do-linux-build @@ -1,9 +1,16 @@ #! /bin/sh set -e -x + +# Only use the "--with-other-libc" parameter, if another libc actually +# exists at this location OTHER_LIBC_DIR=/usr/local/mysql-glibc +OTHER_LIBC="" +if [ -d OTHER_LIBC_DIR ] ; then + OTHER_LIBC="--with-other-libc=$OTHER_LIBC_DIR" +fi -BUILD/compile-pentium-max --with-other-libc=$OTHER_LIBC_DIR \ +BUILD/compile-pentium-max $OTHER_LIBC \ --with-comment="Official MySQL Binary" \ --prefix=/usr/local/mysql --with-extra-charset=complex \ --enable-thread-safe-client --enable-local-infile \ |