diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2008-11-07 19:01:28 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2008-11-07 19:01:28 +0100 |
| commit | d74ce24d8d22bca87ed2e379f0bd3971e8817679 (patch) | |
| tree | a664f95a1a1a0016bb379151e280111b6ec59a23 /support-files | |
| parent | 3080e061e8c96d8d26f766763ad456babd2987ee (diff) | |
| parent | e6f397a1635e7211fea58abe935733c8f8d7cef7 (diff) | |
| download | mariadb-git-d74ce24d8d22bca87ed2e379f0bd3971e8817679.tar.gz | |
Upmerge the second fix for bug#40546 from 5.0 to 5.1
and fix a defect specific to 5.1 (wrong quoting).
support-files/mysql.spec.sh:
Merge the general flag handling (embedding in blanks) from 5.0 to 5.1,
add the 5.1 specific part (do not escape unquoted quote marks).
Still part of the fix for bug#40546.
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 e7c090484b7..d0c5ca86897 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -326,13 +326,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 "--enable-shared \ --with-debug \ --with-innodb \ @@ -364,8 +368,8 @@ fi ############################################################################## (cd mysql-release-%{mysql_version} && -CFLAGS=\"$CFLAGS\" \ -CXXFLAGS=\"$CXXFLAGS\" \ +CFLAGS="$CFLAGS" \ +CXXFLAGS="$CXXFLAGS" \ BuildMySQL "--enable-shared \ --with-innodb \ %if %{CLUSTER_BUILD} @@ -840,6 +844,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 Joerg Bruehe <joerg@mysql.com> - Modify CFLAGS and CXXFLAGS such that a debug build is not optimized. |