diff options
| author | monty@hundin.mysql.fi <> | 2002-03-27 01:56:10 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-03-27 01:56:10 +0200 |
| commit | 727e507bca7fe9342f543340f9d7ea7a02e9708e (patch) | |
| tree | 6998f99b1790b678ac1558e748e2a8c992bbfa22 /support-files | |
| parent | ce541b292a20114adc5d5bb10142a441246e0675 (diff) | |
| parent | 3a571c7c135b9e9707e09ace4058d00ed6935fd1 (diff) | |
| download | mariadb-git-727e507bca7fe9342f543340f9d7ea7a02e9708e.tar.gz | |
merge with 3.23.50
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 604e067087b..a6152fbde91 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -204,9 +204,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" = "/" @@ -217,10 +225,16 @@ fi rm -rf $RBR mkdir -p $RBR +# +# Use MYSQL_BUILD_PATH so that we can use a dedicated version of gcc +# +PATH=${MYSQL_BUILD_PATH:-/bin:/usr/bin} +export PATH + # 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 . @@ -250,7 +264,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 |