diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2008-11-07 20:08:37 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2008-11-07 20:08:37 +0100 |
| commit | 6fc34d0a0d2dd463cc77d88abfa05673bed9f164 (patch) | |
| tree | 67d11a4af00bd6956dd9794e47fd7d881d09c389 /support-files | |
| parent | 2f08a0798d935ccd93e4bc2ee34dd60e0c9c3c0f (diff) | |
| parent | d74ce24d8d22bca87ed2e379f0bd3971e8817679 (diff) | |
| download | mariadb-git-6fc34d0a0d2dd463cc77d88abfa05673bed9f164.tar.gz | |
Merge second fix for bug#40546 to the 5.1.30 tree.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 812b5958b91..790e7c830ac 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -341,13 +341,17 @@ CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-except ( # We are in a subshell, so we can modify variables just for one run. -CFLAGS=`echo $CFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //' -e 's/$/ -g/'` -CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]* //' -e 's/-unroll2 //' -e 's/-ip //' -e 's/$/ -g/'` +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/ $//'` # Add -g and --with-debug. cd mysql-debug-%{mysql_version} && -CFLAGS=\"$CFLAGS\" \ -CXXFLAGS=\"$CXXFLAGS\" \ +CFLAGS="$CFLAGS" \ +CXXFLAGS="$CXXFLAGS" \ BuildMySQL "\ --with-debug \ --with-comment=\"MySQL Community Server - Debug (GPL)\"") @@ -367,8 +371,8 @@ fi ############################################################################## (cd mysql-release-%{mysql_version} && -CFLAGS=\"$CFLAGS\" \ -CXXFLAGS=\"$CXXFLAGS\" \ +CFLAGS="$CFLAGS" \ +CXXFLAGS="$CXXFLAGS" \ BuildMySQL "\ --with-embedded-server \ --with-comment=\"MySQL Community Server (GPL)\"") @@ -830,6 +834,11 @@ 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, + and fix a wrong quoting: un-quoted quote marks must not be escaped. + * Thu Nov 06 2008 Kent Boortz <kent.boortz@sun.com> - Removed "mysql_upgrade_shell" |