[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit:     40da30287bc1129cac79eb959a089f15cccbbd78
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Wed Apr  2 17:37:24 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Apr  2 17:37:24 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=40da3028

Revert "[eclass] Possbile better fix for debug builds"

This reverts commit 63a8c74fc976c60926dc28839ad76e3887fa7623.

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

---
 eclass/mysql-cmake.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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