X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmysql.git;a=blobdiff_plain;f=mysql-config.patch;h=a87be1b79117e6966729a2dda03acc30bedee351;hp=7a8fc65cc3b8b1af45ae6d8dce0c95bcb0907c46;hb=456c407349487a98cf7b12da72c8bb28e84fc297;hpb=8347fb84b4ee468c7f5815cb61866499568a4873 diff --git a/mysql-config.patch b/mysql-config.patch index 7a8fc65..a87be1b 100644 --- a/mysql-config.patch +++ b/mysql-config.patch @@ -1,18 +1,21 @@ ---- mysql-5.1.26-rc/scripts/mysql_config.sh.orig 2008-07-01 00:36:15.000000000 +0200 -+++ mysql-5.1.26-rc/scripts/mysql_config.sh 2008-08-25 19:39:20.111236513 +0200 -@@ -132,21 +132,21 @@ +--- Percona-Server-5.6.13-rel61.0/scripts/mysql_config.sh.orig 2013-10-07 10:25:25.000000000 +0000 ++++ Percona-Server-5.6.13-rel61.0/scripts/mysql_config.sh 2013-10-13 13:25:11.342999630 +0000 +@@ -124,23 +124,23 @@ + for remove in DDBUG_OFF DSAFE_MUTEX DFORCE_INIT_OF_VARS \ DEXTRA_DEBUG DHAVE_purify 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 + unroll2 ip mp restrict 'f[-a-z0-9]*' 'g[-a-z0-9]*' 'm[-a-z0-9]*' 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"` +- cxxflags=`echo "$cxxflags"|sed -e "s/ -$remove */ /g"` + cflags=`echo "$cflags"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` ++ cxxflags=`echo "$cflags"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` done cflags=`echo "$cflags"|sed -e 's/ *\$//'` + cxxflags=`echo "$cxxflags"|sed -e 's/ *\$//'` # Same for --libs(_r) -for remove in lmtmalloc static-libcxa i-static static-intel