diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2008-11-07 18:38:40 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2008-11-07 18:38:40 +0100 |
| commit | c81061e458570846723672c942c12aa15bfef146 (patch) | |
| tree | c25ccdf6b8d722176d7efa11de59aa90074d439c /support-files | |
| parent | e7fe28805434bd94d0f42c9e413fb3933d46edf3 (diff) | |
| download | mariadb-git-c81061e458570846723672c942c12aa15bfef146.tar.gz | |
"spec" file for RPM builds:
Fix yesterday's patch so that it also works for the last flag.
Still part of the fix for bug#40546.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index dc80d379b83..7bb35e6072e 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -320,8 +320,12 @@ do # We are in a subshell, so we can modify variables just for one run. if test "$servertype" != ' ' then - CFLAGS=`echo $CFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //'` - CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //'` + CFLAGS=`echo " $CFLAGS " | \ + sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \ + -e 's/^ //' -e 's/ $//'` + CXXFLAGS=`echo " $CXXFLAGS " | \ + sed -e 's/ -O[0-9]* / /' -e 's/ -unroll2 / /' -e 's/ -ip / /' \ + -e 's/^ //' -e 's/ $//'` fi BuildMySQL "\ @@ -807,6 +811,10 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com> + +- Correct yesterday's fix, so that it also works for the last flag. + * Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com> - Modify CFLAGS and CXXFLAGS such that a debug build is not optimized. |