Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass
Date: Sat, 27 Feb 2010 18:21:40
Message-Id: E1NlRIG-0006gw-7C@stork.gentoo.org
1 robbat2 10/02/27 18:21:36
2
3 Modified: mysql.eclass
4 Log:
5 Fixup more pbxt and xtradb issues, and try to fix dodoc QA.
6
7 Revision Changes Path
8 1.134 eclass/mysql.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.134&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.134&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.133&r2=1.134
13
14 Index: mysql.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
17 retrieving revision 1.133
18 retrieving revision 1.134
19 diff -p -w -b -B -u -u -r1.133 -r1.134
20 --- mysql.eclass 21 Feb 2010 00:18:16 -0000 1.133
21 +++ mysql.eclass 27 Feb 2010 18:21:35 -0000 1.134
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2009 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.133 2010/02/21 00:18:16 robbat2 Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.134 2010/02/27 18:21:35 robbat2 Exp $
27
28 # @ECLASS: mysql.eclass
29 # @MAINTAINER:
30 @@ -188,7 +188,7 @@ mysql_version_is_at_least "5.1" \
31 mysql_version_is_at_least "5.1.12" \
32 && [[ -n "${PBXT_VERSION}" ]] \
33 && PBXT_P="pbxt-${PBXT_VERSION}" \
34 -&& PBXT_SRC_URI="mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
35 +&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
36 && SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
37 && IUSE="${IUSE} pbxt"
38
39 @@ -196,8 +196,10 @@ mysql_version_is_at_least "5.1.12" \
40 mysql_version_is_at_least "5.1.26" \
41 && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \
42 && XTRADB_P="percona-xtradb-${XTRADB_VER}" \
43 -&& XTRADB_SRC_URI="http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
44 -&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )" \
45 +&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
46 +&& XTRADB_SRC_URI1="http://www.percona.com/percona-builds/xtradb/${XTRADB_SRC_URI_COMMON}" \
47 +&& XTRADB_SRC_URI2="http://www.percona.com/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
48 +&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} )" \
49 && IUSE="${IUSE} xtradb"
50
51 #
52 @@ -534,7 +536,7 @@ pbxt_src_configure() {
53 AT_GNUCONF_UPDATE="yes" eautoreconf
54
55 local myconf=""
56 - myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}"
57 + myconf="${myconf} --with-mysql=${S} --libdir=${MY_LIBDIR}"
58 use debug && myconf="${myconf} --with-debug=full"
59 # TODO: is it safe/needed to use econf here ?
60 ./configure ${myconf} || die "Problem configuring PBXT storage engine"
61 @@ -554,7 +556,7 @@ pbxt_src_compile() {
62
63 pbxt_src_install() {
64 pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
65 - make install || die "Failed to install PBXT"
66 + emake install DESTDIR="${D}" || die "Failed to install PBXT"
67 popd
68 }
69
70 @@ -693,21 +695,22 @@ mysql_src_prepare() {
71 i="innobase"
72 o="${WORKDIR}/storage-${i}.mysql-upstream"
73 # Have we been here already?
74 - [ -h "${i}" ] && rm -f "${i}"
75 + [ -d "${o}" ] && rm -f "${i}"
76 # Or maybe we haven't
77 [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
78 - ln -s "${WORKDIR}/${XTRADB_P}" "${i}"
79 + cp -ra "${WORKDIR}/${XTRADB_P}" "${i}"
80 popd
81 fi
82
83 if mysql_version_is_at_least "5.1.12" ; then
84 - einfo "Updating innobase cmake"
85 rebuilddirlist="."
86 - # TODO: check this with a cmake expert
87 - cmake \
88 - -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
89 - -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
90 - "storage/innobase"
91 + # This does not seem to be needed presently. robbat2 2010/02/23
92 + #einfo "Updating innobase cmake"
93 + ## TODO: check this with a cmake expert
94 + #cmake \
95 + # -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
96 + # -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
97 + # "storage/innobase"
98 else
99 rebuilddirlist=". innobase"
100 fi
101 @@ -916,12 +919,12 @@ mysql_src_install() {
102 "${S}"/support-files/magic \
103 "${S}"/support-files/ndb-config-2-node.ini
104 do
105 - dodoc "${script}"
106 + [[ -f "$script" ]] && dodoc "${script}"
107 done
108
109 docinto "scripts"
110 for script in "${S}"/scripts/mysql* ; do
111 - [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
112 + [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
113 done
114
115 fi