diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2010-03-14 23:08:58 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2010-03-14 23:08:58 +0000 |
| commit | 482060beca66bbb6d8d4cf9664ecc586e698dde9 (patch) | |
| tree | ab025ffd227d541212c49a6c96b9a9d490b4d086 /01050_all_mariadb_mysql_config_cleanup-5.1.41.patch | |
| parent | Final release of 5.0.87 b20 percona patches. (diff) | |
| download | mysql-extras-482060beca66bbb6d8d4cf9664ecc586e698dde9.tar.gz mysql-extras-482060beca66bbb6d8d4cf9664ecc586e698dde9.tar.bz2 mysql-extras-482060beca66bbb6d8d4cf9664ecc586e698dde9.zip | |
Patchset for MariaDB from bug #303130.
Diffstat (limited to '01050_all_mariadb_mysql_config_cleanup-5.1.41.patch')
| -rw-r--r-- | 01050_all_mariadb_mysql_config_cleanup-5.1.41.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/01050_all_mariadb_mysql_config_cleanup-5.1.41.patch b/01050_all_mariadb_mysql_config_cleanup-5.1.41.patch new file mode 100644 index 0000000..2c16e1e --- /dev/null +++ b/01050_all_mariadb_mysql_config_cleanup-5.1.41.patch @@ -0,0 +1,46 @@ +--- mysql.old/scripts/mysql_config.sh 2007-01-04 22:35:51.000000000 +0100 ++++ mysql.new/scripts/mysql_config.sh 2007-01-04 23:35:31.000000000 +0100 +@@ -123,22 +123,28 @@ + include="-I$pkgincludedir" + + # Remove some options that a client doesn't have to care about +-# FIXME until we have a --cxxflags, we need to remove -Xa +-# and -xstrconst to make --cflags usable for Sun Forte C++ +-# FIXME until we have a --cxxflags, we need to remove -AC99 +-# to make --cflags usable for HP C++ (aCC) +-for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \ +- DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \ +- DEXTRA_DEBUG DHAVE_valgrind O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \ +- 'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \ +- Xa xstrconst "xc99=none" AC99 \ +- unroll2 ip mp restrict ++tmpcflags="" ++for f in $cflags + do +- # The first option we might strip will always have a space before it because +- # we set -I$pkgincludedir as the first option +- cflags=`echo "$cflags"|sed -e "s/ -$remove */ /g"` ++ case "${f}" in ++ -DDBUG_OFF) f="" ;; ++ -DSAFEMALLOC) f="" ;; ++ -USAFEMALLOC) f="" ;; ++ -DSAFE_MUTEX) f="" ;; ++ -DPEDANTIC_SAFEMALLOC) f="" ;; ++ -DUNIV_MUST_NOT_INLINE) f="" ;; ++ -DFORCE_INIT_OF_VARS) f="" ;; ++ -DEXTRA_DEBUG) f="" ;; ++ -DHAVE_purify) f="" ;; ++ -[ID]*) tmpcflags="${tmpcflags} ${f}" ;; ++ -[Ll]*) ++ libs="${libs} ${f}" ++ libs_r="${libs_r} ${f}" ++ embedded_libs="${embedded_libs} ${f}" ++ ;; ++ esac + done +-cflags=`echo "$cflags"|sed -e 's/ *\$//'` ++cflags="${tmpcflags# }" + + # Same for --libs(_r) + for remove in lmtmalloc static-libcxa i-static static-intel + |