summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-03-19 00:55:48 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-03-19 00:55:48 +0000
commite54d19ca65fc24de540fc336c3f84db5ab151562 (patch)
treed91104bc8ea5f52e70450097e2f3655e7c28aada /eclass
parentremove -Werror flag wrt #494332 (diff)
downloadhistorical-e54d19ca65fc24de540fc336c3f84db5ab151562.tar.gz
historical-e54d19ca65fc24de540fc336c3f84db5ab151562.tar.bz2
historical-e54d19ca65fc24de540fc336c3f84db5ab151562.zip
respect CFLAGS wrt #497532
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/mysql-cmake.eclass7
2 files changed, 9 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 6839b04b41d4..7b2cbd66be28 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1180 2014/03/18 16:52:10 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1181 2014/03/19 00:55:48 hasufell Exp $
+
+ 19 Mar 2014; Julian Ospald <hasufell@gentoo.org> mysql-cmake.eclass:
+ respect CFLAGS wrt #497532
18 Mar 2014; Christoph Junghans <ottxor@gentoo.org> texlive-common.eclass:
added prefix support (bug #485608)
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 548bbd3c2c69..c5ecf7633fa2 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.17 2013/06/27 17:23:33 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.18 2014/03/19 00:55:48 hasufell Exp $
# @ECLASS: mysql-cmake.eclass
# @MAINTAINER:
@@ -238,7 +238,10 @@ mysql-cmake_src_configure() {
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