diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-03-25 18:10:34 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-03-25 18:10:34 +0200 |
| commit | 9ee0658adc1d79528e8a1b78c0369ebad6bb57d0 (patch) | |
| tree | 37e6dbff799fdd1e484007e0c2cec9bf3bbb073a /support-files | |
| parent | 9ed83bda3d196552934eaa8fa284463e87f82865 (diff) | |
| download | mariadb-git-9ee0658adc1d79528e8a1b78c0369ebad6bb57d0.tar.gz | |
Fixed that RPM can be recompiled even if there is not another glibc in /usr/local/mysql-glibc
Build-tools/Do-compile:
Fix to build mysqlcom
Build-tools/Do-rpm:
Fixes for building with gcc 3.0.4
Docs/manual.texi:
Small bug fix
configure.in:
Cleanup
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 81ee0c52eea..1409b8905b4 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -188,9 +188,17 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \ make benchdir_root=$RPM_BUILD_ROOT/usr/share/ } -# Use the build root for temporary storage of the shared libraries. +# Use our own copy of glibc OTHER_LIBC_DIR=/usr/local/mysql-glibc +USE_OTHER_LIBC_DIR="" +if test -d "OTHER_LIBC_DIR" +then + USE_OTHER_LIBC_DIR="--with-other-libc=$OTHER_LIBC_DIR" +fi + +# Use the build root for temporary storage of the shared libraries. + RBR=$RPM_BUILD_ROOT MBD=$RPM_BUILD_DIR/mysql-%{mysql_version} if test -z "$RBR" -o "$RBR" = "/" @@ -204,7 +212,7 @@ mkdir -p $RBR # We need to build shared libraries separate from mysqld-max because we # are using --with-other-libc -BuildMySQL "--disable-shared --with-other-libc=$OTHER_LIBC_DIR --with-berkeley-db --with-innodb --with-mysqld-ldflags='-all-static' --with-server-suffix='-Max'" +BuildMySQL "--disable-shared $USE_OTHER_LIBC_DIR --with-berkeley-db --with-innodb --with-mysqld-ldflags='-all-static' --with-server-suffix='-Max'" # Save everything for debug # tar cf $RBR/all.tar . @@ -234,7 +242,7 @@ automake BuildMySQL "--disable-shared" \ "--with-mysqld-ldflags='-all-static'" \ "--with-client-ldflags='-all-static'" \ - "--with-other-libc=$OTHER_LIBC_DIR" \ + "$USE_OTHER_LIBC_DIR" \ "--without-berkeley-db --without-innodb" nm --numeric-sort sql/mysqld > sql/mysqld.sym |