summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@tuffmail.com>2014-04-02 13:37:24 -0400
committerBrian Evans <grknight@tuffmail.com>2014-04-02 13:37:24 -0400
commit40da30287bc1129cac79eb959a089f15cccbbd78 (patch)
tree22f72114c8cecb23b2b72160167b7a8025efe5f7
parent[mysql] Version bump for 5.7 rpl.rpl_typeconv test fails due to timeout. res... (diff)
downloadmysql-40da30287bc1129cac79eb959a089f15cccbbd78.tar.gz
mysql-40da30287bc1129cac79eb959a089f15cccbbd78.tar.bz2
mysql-40da30287bc1129cac79eb959a089f15cccbbd78.zip
Revert "[eclass] Possbile better fix for debug builds"
This reverts commit 63a8c74fc976c60926dc28839ad76e3887fa7623. Signed-off-by: Brian Evans <grknight@tuffmail.com>
-rw-r--r--eclass/mysql-cmake.eclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index df067a6..96f89b8 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -275,10 +275,12 @@ mysql-cmake_src_configure() {
debug-print-function ${FUNCNAME} "$@"
- CMAKE_BUILD_TYPE="$(usex debug "Debug" "RelWithDebInfo")"
+ CMAKE_BUILD_TYPE="RelWithDebInfo"
# debug hack wrt #497532
mycmakeargs=(
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
-DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
-DSYSCONFDIR=${EPREFIX}/etc/mysql