commit: 06fe15f3ea19c6cf37da960aab196433e787ebb1
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 25 14:15:45 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Nov 25 14:15:45 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=06fe15f3
Respin mysql_config patch for mariadb 10.0.15
---
00000_index.txt | 10 ++++-
...0_all_mariadb_mysql_config_cleanup-5.5.41.patch | 45 ++++++++++++++++++++++
2 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/00000_index.txt b/00000_index.txt
index 43f86ac..0d78670 100644
--- a/00000_index.txt
+++ b/00000_index.txt
@@ -241,7 +241,15 @@
@@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS
@patch 01050_all_mariadb_mysql_config_cleanup-5.5.patch
-@ver 5.05.00.00 to 10.00.99.99
+@ver 5.05.00.00 to 5.05.40.99
+@ver 10.00.00.00 to 10.00.14.99
+@pn mariadb
+@pn mariadb-galera
+@@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS
+
+@patch 01050_all_mariadb_mysql_config_cleanup-5.5.41.patch
+@ver 5.05.41.00 to 5.05.99.99
+@ver 10.00.15.00 to 10.00.99.99
@pn mariadb
@pn mariadb-galera
@@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS
diff --git a/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch
b/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch
new file mode 100644
index 0000000..f97c4cb
--- /dev/null
+++ b/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch
@@ -0,0 +1,45 @@
+--- mysql.old/scripts/mysql_config.sh 2013-05-02 20:30:14.000000000 -0400
++++ mysql.new/scripts/mysql_config.sh 2013-05-02 20:32:36.000000000 -0400
+@@ -128,25 +128,29 @@
+ cflags="$include @CFLAGS@ " #note: end space!
+
+ # 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 DSAFE_MUTEX 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 'W[-A-Za-z]*=[-A-Za-z0-9]*' \
+- 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 ':again' -e "s/ -$remove */ /g" -e 't again'`
++ case "${f}" in
++ -DDBUG_OFF) f="" ;;
++ -DSAFE_MUTEX) f="" ;;
++ -DUNIV_MUST_NOT_INLINE) f="" ;;
++ -DFORCE_INIT_OF_VARS) f="" ;;
++ -DEXTRA_DEBUG) f="" ;;
++ -DHAVE_valgrind) 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
++for remove in lmtmalloc static-libcxa i-static static-intel lprobes_mysql
+ do
+ # We know the strings starts with a space
+ libs=`echo "$libs"|sed -e "s/ -$remove */ /g"`
