Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql:master commit in: eclass/
Date: Fri, 06 Jan 2012 19:51:02
Message-Id: 0eb934edadc37ac2dabfe7a006c0e0d5cc4f1125.robbat2@gentoo
1 commit: 0eb934edadc37ac2dabfe7a006c0e0d5cc4f1125
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 6 19:50:06 2012 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 6 19:50:13 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=0eb934ed
7
8 systemtap eclass changes.
9
10 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
11
12 ---
13 eclass/mysql-cmake.eclass | 1 +
14 eclass/mysql-v2.eclass | 5 +++++
15 2 files changed, 6 insertions(+), 0 deletions(-)
16
17 diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
18 index f64f9e5..51e18f0 100644
19 --- a/eclass/mysql-cmake.eclass
20 +++ b/eclass/mysql-cmake.eclass
21 @@ -128,6 +128,7 @@ configure_cmake_standard() {
22 $(cmake-utils_use_with debug)
23 $(cmake-utils_use_with embedded EMBEDDED_SERVER)
24 $(cmake-utils_use_with profiling)
25 + $(cmake-utils_use_enable systemtap DTRACE)
26 )
27
28 if use ssl; then
29
30 diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
31 index a8d9f5f..586a6aa 100644
32 --- a/eclass/mysql-v2.eclass
33 +++ b/eclass/mysql-v2.eclass
34 @@ -227,6 +227,8 @@ IUSE="${IUSE} berkdb"
35 && mysql_version_is_at_least "5.2.5" \
36 && IUSE="${IUSE} sphinx"
37
38 +mysql_version_is_at_least "5.5.7" \
39 +&& IUSE="${IUSE} systemtap"
40
41 #
42 # DEPENDENCIES:
43 @@ -279,6 +281,9 @@ mysql_version_is_at_least "5.5.8" \
44 && mysql_version_is_at_least "5.2.5" \
45 && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )"
46
47 +mysql_version_is_at_least "5.5.7" \
48 +&& DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )"
49 +
50 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
51 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"