]>
Commit | Line | Data |
---|---|---|
400786a2 AM |
1 | --- Percona-Server-5.6.13-rel61.0/scripts/mysql_config.sh~ 2013-10-07 12:25:25.000000000 +0200 |
2 | +++ Percona-Server-5.6.13-rel61.0/scripts/mysql_config.sh 2013-10-15 18:17:41.547988430 +0200 | |
3 | @@ -124,23 +124,23 @@ | |
4 | for remove in DDBUG_OFF DSAFE_MUTEX DFORCE_INIT_OF_VARS \ | |
f11bce9d ER |
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]*' \ | |
f11bce9d ER |
7 | - unroll2 ip mp restrict |
8 | + unroll2 ip mp restrict 'f[-a-z0-9]*' 'g[-a-z0-9]*' 'm[-a-z0-9]*' | |
9 | do | |
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"` | |
400786a2 AM |
13 | + cflags=`echo "$cflags"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` |
14 | cxxflags=`echo "$cxxflags"|sed -e "s/ -$remove */ /g"` | |
f11bce9d ER |
15 | done |
16 | cflags=`echo "$cflags"|sed -e 's/ *\$//'` | |
400786a2 | 17 | cxxflags=`echo "$cxxflags"|sed -e 's/ *\$//'` |
f11bce9d ER |
18 | |
19 | # Same for --libs(_r) | |
20 | -for remove in lmtmalloc static-libcxa i-static static-intel | |
21 | +for remove in lmtmalloc static-libcxa i-static static-intel 'Wl,-[-a-z0-9,]*' | |
22 | do | |
23 | # We know the strings starts with a space | |
24 | - libs=`echo "$libs"|sed -e "s/ -$remove */ /g"` | |
25 | - libs_r=`echo "$libs_r"|sed -e "s/ -$remove */ /g"` | |
26 | - embedded_libs=`echo "$embedded_libs"|sed -e "s/ -$remove */ /g"` | |
400786a2 AM |
27 | + libs=`echo "$libs"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` |
28 | + libs_r=`echo "$libs_r"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` | |
29 | + embedded_libs=`echo "$embedded_libs"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` | |
f11bce9d ER |
30 | done |
31 | ||
32 | # Strip trailing and ending space if any, and '+' (FIXME why?) |