diff options
Diffstat (limited to 'Build-tools')
| -rwxr-xr-x | Build-tools/Do-linux-build | 10 | ||||
| -rwxr-xr-x | Build-tools/Do-patch-file | 4 | ||||
| -rwxr-xr-x | Build-tools/Do-rpm | 10 |
3 files changed, 18 insertions, 6 deletions
diff --git a/Build-tools/Do-linux-build b/Build-tools/Do-linux-build index e5b0a49fe75..a8b12d8b4ae 100755 --- a/Build-tools/Do-linux-build +++ b/Build-tools/Do-linux-build @@ -1,9 +1,17 @@ #! /bin/sh set -e -x + +# Only use the "--with-other-libc" parameter, if another libc actually +# exists, since this will also force static linking, which does not work +# together with OpenSSL 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 \ diff --git a/Build-tools/Do-patch-file b/Build-tools/Do-patch-file index 975c10c6b0e..7e6d4c493d8 100755 --- a/Build-tools/Do-patch-file +++ b/Build-tools/Do-patch-file @@ -13,8 +13,8 @@ NEW="mysql-$VER.tar.gz" OLD="mysql-$PVER.tar.gz" RESULT="mysql-$PVER-$VER.patch.gz" PATCH_DIR=/my/web/Downloads-live/Patches -RESULT_DIR=/my/web/Downloads-live/MySQL-3.23 -RESULT_DIR_MAX=/my/web/Downloads-live/MySQL-Max-3.23 +RESULT_DIR=/my/web/Downloads-live/MySQL-4.0 +RESULT_DIR_MAX=/my/web/Downloads-live/MySQL-Max-4.0 if test ! -f $NEWDIR/$NEW then diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm index 410338b9ce6..6d107bc2413 100755 --- a/Build-tools/Do-rpm +++ b/Build-tools/Do-rpm @@ -159,10 +159,14 @@ cat > $logdir/$TMP_SCRIPT_MYSQL <<END set -x # Check environment -export MYSQL_BUILD_PATH="/usr/local/bin:/my/gnu/bin:/usr/bin:/bin" -export MYSQL_BUILD_CFLAGS="-O6 -fno-omit-frame-pointer -mcpu=pentiumpro" +#export MYSQL_BUILD_PATH="/usr/local/bin:/my/gnu/bin:/usr/bin:/bin" +#export MYSQL_BUILD_CFLAGS="-O6 -fno-omit-frame-pointer -mcpu=pentiumpro" +#export MYSQL_BUILD_CXXFLAGS="-O6 -fno-omit-frame-pointer \ +# -felide-constructors -fno-exceptions -fno-rtti -mcpu=pentiumpro" +export MYSQL_BUILD_PATH="/usr/bin:/bin" +export MYSQL_BUILD_CFLAGS="-O6 -fno-omit-frame-pointer -mpentium" export MYSQL_BUILD_CXXFLAGS="-O6 -fno-omit-frame-pointer \ - -felide-constructors -fno-exceptions -fno-rtti -mcpu=pentiumpro" + -felide-constructors -fno-exceptions -fno-rtti -mpentium" gcc -v # Make RPM |