1 --- Percona-Server-5.6.13-rel61.0/scripts/mysql_config.sh.orig 2013-10-07 10:25:25.000000000 +0000
2 +++ Percona-Server-5.6.13-rel61.0/scripts/mysql_config.sh 2013-10-13 13:25:11.342999630 +0000
4 for remove in DDBUG_OFF DSAFE_MUTEX DFORCE_INIT_OF_VARS \
5 DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \
6 'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \
7 - unroll2 ip mp restrict
8 + unroll2 ip mp restrict 'f[-a-z0-9]*' 'g[-a-z0-9]*' 'm[-a-z0-9]*'
10 # The first option we might strip will always have a space before it because
11 # we set -I$pkgincludedir as the first option
12 - cflags=`echo "$cflags"|sed -e "s/ -$remove */ /g"`
13 - cxxflags=`echo "$cxxflags"|sed -e "s/ -$remove */ /g"`
14 + cflags=`echo "$cflags"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"`
15 + cxxflags=`echo "$cflags"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"`
17 cflags=`echo "$cflags"|sed -e 's/ *\$//'`
18 cxxflags=`echo "$cxxflags"|sed -e 's/ *\$//'`
21 -for remove in lmtmalloc static-libcxa i-static static-intel
22 +for remove in lmtmalloc static-libcxa i-static static-intel 'Wl,-[-a-z0-9,]*'
24 # We know the strings starts with a space
25 - libs=`echo "$libs"|sed -e "s/ -$remove */ /g"`
26 - libs_r=`echo "$libs_r"|sed -e "s/ -$remove */ /g"`
27 - embedded_libs=`echo "$embedded_libs"|sed -e "s/ -$remove */ /g"`
28 + libs=`echo "$libs"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"`
29 + libs_r=`echo "$libs_r"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"`
30 + embedded_libs=`echo "$embedded_libs"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"`
33 # Strip trailing and ending space if any, and '+' (FIXME why?)