1 --- mysql-5.1.26-rc/scripts/mysql_config.sh.orig 2008-07-01 00:36:15.000000000 +0200
2 +++ mysql-5.1.26-rc/scripts/mysql_config.sh 2008-08-25 19:39:20.111236513 +0200
4 DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \
5 'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \
6 Xa xstrconst "xc99=none" AC99 \
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 + cflags=`echo "$cflags"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"`
15 cflags=`echo "$cflags"|sed -e 's/ *\$//'`
18 -for remove in lmtmalloc static-libcxa i-static static-intel
19 +for remove in lmtmalloc static-libcxa i-static static-intel 'Wl,-[-a-z0-9,]*'
21 # We know the strings starts with a space
22 - libs=`echo "$libs"|sed -e "s/ -$remove */ /g"`
23 - libs_r=`echo "$libs_r"|sed -e "s/ -$remove */ /g"`
24 - embedded_libs=`echo "$embedded_libs"|sed -e "s/ -$remove */ /g"`
25 + libs=`echo "$libs"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"`
26 + libs_r=`echo "$libs_r"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"`
27 + embedded_libs=`echo "$embedded_libs"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"`
30 # Strip trailing and ending space if any, and '+' (FIXME why?)