bzr commit into mysql-6.0 branch (joerg:2701)

[Joerg Bruehe]

#At file:///MySQL/REPO/V60/bug40546-6.0/

 2701 Joerg Bruehe	2008-11-06 [merge]
      Upmerge from 5.1, success with automerge.
modified:
  support-files/mysql.spec.sh

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2008-10-22 11:51:28 +0000
+++ b/support-files/mysql.spec.sh	2008-11-06 16:18:04 +0000
@@ -311,8 +311,6 @@ mkdir -p $RBR%{_libdir}/mysql
 PATH=${MYSQL_BUILD_PATH:-/bin:/usr/bin}
 export PATH
 
-# Build the Debug binary.
-
 # Use gcc for C and C++ code (to avoid a dependency on libstdc++ and
 # including exceptions into the code
 if [ -z "$CXX" -a -z "$CC" ]
@@ -321,16 +319,25 @@ then
 	export CXX="gcc"
 fi
 
+# Prepare compiler flags
+CFLAGS=${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS}
+CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti }
+
 ##############################################################################
 #
 #  Build the debug version
 #
 ##############################################################################
 
-# Strip -Oxxx, add -g and --with-debug.
-(cd mysql-debug-%{mysql_version} &&
-CFLAGS=`echo "${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS} -g" | sed -e 's/-O[0-9]*//g'` \
-CXXFLAGS=`echo "${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti} -g" | sed -e 's/-O[0-9]*//g'` \
+(
+# 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/'`
+
+# Add -g and --with-debug.
+cd mysql-debug-%{mysql_version} &&
+CFLAGS=\"$CFLAGS\" \
+CXXFLAGS=\"$CXXFLAGS\" \
 BuildMySQL "--enable-shared \
 		--with-debug \
 		--with-innodb \
@@ -371,8 +378,8 @@ fi
 ##############################################################################
 
 (cd mysql-release-%{mysql_version} &&
-CFLAGS="${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS} -g" \
-CXXFLAGS="${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti} -g" \
+CFLAGS=\"$CFLAGS\" \
+CXXFLAGS=\"$CXXFLAGS\" \
 BuildMySQL "--enable-shared \
 		--with-innodb \
 %if %{CLUSTER_BUILD}
@@ -851,6 +858,11 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog
+* Thu Nov 06 2008 Joerg Bruehe <joerg@stripped>
+
+- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
+  This should cover both gcc and icc flags.  Fixes bug#40546.
+  
 * Fri Aug 29 2008 Kent Boortz <kent@stripped>
 
 - Removed the "Federated" storage engine option, and enabled in all