List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:November 9 2012 8:18pm
Subject:bzr push into mysql-5.6 branch (joerg.bruehe:4564 to 4565)
View as plain text  
 4565 Joerg Bruehe	2012-11-09
      RPMs for ULN: Use 'g++' for C++ sources

    modified:
      packaging/rpm-uln/mysql.spec.sh
 4564 Joerg Bruehe	2012-11-09
      Building RPMs for ULN:
      
      The patch "mysql-5.5-stack-guard.patch" needs to be adapted
      to code changes in "sql/mysqld.cc" which were
      done in MySQL 5.6.
      
      Also, reflect that in a name change: "5.5" -> "5.6".

    renamed:
      packaging/rpm-uln/mysql-5.5-stack-guard.patch => packaging/rpm-uln/mysql-5.6-stack-guard.patch
    modified:
      packaging/rpm-uln/CMakeLists.txt
      packaging/rpm-uln/mysql.spec.sh
      packaging/rpm-uln/mysql-5.6-stack-guard.patch
=== modified file 'packaging/rpm-uln/mysql.spec.sh'
--- a/packaging/rpm-uln/mysql.spec.sh	2012-11-09 19:36:09 +0000
+++ b/packaging/rpm-uln/mysql.spec.sh	2012-11-09 20:17:36 +0000
@@ -448,7 +448,7 @@ rm -rf %{src_dir}/mysql-test/lib/v1
 
 export PATH=${MYSQL_BUILD_PATH:-$PATH}
 export CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
-export CXX=${MYSQL_BUILD_CXX:-${CXX:-gcc}}
+export CXX=${MYSQL_BUILD_CXX:-${CXX:-g++}}
 export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
 # Following "%ifarch" developed by RedHat, MySQL/Oracle does not support/maintain Linux/Sparc:
 # gcc seems to have some bugs on sparc as of 4.4.1, back off optimization
@@ -456,7 +456,7 @@ export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CF
 %ifarch sparc sparcv9 sparc64
 CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
 %endif
-export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti}}
+export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors}}
 export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}
 export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}}
 export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-%{?_smp_mflags}}
@@ -965,8 +965,10 @@ fi
 
 %changelog
 * Fri Nov  9 2012 Joerg Bruehe <joerg.bruehe@stripped>
-  The "stack-guard.patch" needs to be adapted for MySQL 5.6,
+- The "stack-guard.patch" needs to be adapted for MySQL 5.6,
   reflect that in a name change "5.5" -> "5.6".
+- Set CXX=g++ by default to add a dependency on libgcc/libstdc++.
+  Also, remove the use of the -fno-exceptions and -fno-rtti flags.
 
 * Tue Sep 18 2012 Joerg Bruehe <joerg.bruehe@stripped>
 - Restrict the vendor check to Oracle: There is no history here

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.6 branch (joerg.bruehe:4564 to 4565) Joerg Bruehe12 Nov