From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NlRII-0005VR-2T for garchives@archives.gentoo.org; Sat, 27 Feb 2010 18:21:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 752E9E08AD; Sat, 27 Feb 2010 18:21:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 25B16E08AD for ; Sat, 27 Feb 2010 18:21:37 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id BE1E71B4034 for ; Sat, 27 Feb 2010 18:21:36 +0000 (UTC) Received: from robbat2 by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NlRIG-0006gw-7C for gentoo-commits@lists.gentoo.org; Sat, 27 Feb 2010 18:21:36 +0000 From: "Robin H. Johnson (robbat2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, robbat2@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: mysql.eclass X-VCS-Directories: eclass X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Message-Id: Sender: "Robin H. Johnson" Date: Sat, 27 Feb 2010 18:21:36 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 20f36d4a-ec83-4792-b575-785bf505034e X-Archives-Hash: 9ac9c144c099ee756d957b7ffa7e9f6a robbat2 10/02/27 18:21:36 Modified: mysql.eclass Log: Fixup more pbxt and xtradb issues, and try to fix dodoc QA. Revision Changes Path 1.134 eclass/mysql.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclas= s?rev=3D1.134&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclas= s?rev=3D1.134&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclas= s?r1=3D1.133&r2=3D1.134 Index: mysql.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v retrieving revision 1.133 retrieving revision 1.134 diff -p -w -b -B -u -u -r1.133 -r1.134 --- mysql.eclass 21 Feb 2010 00:18:16 -0000 1.133 +++ mysql.eclass 27 Feb 2010 18:21:35 -0000 1.134 @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.133 2010/02/2= 1 00:18:16 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.134 2010/02/2= 7 18:21:35 robbat2 Exp $ =20 # @ECLASS: mysql.eclass # @MAINTAINER: @@ -188,7 +188,7 @@ mysql_version_is_at_least "5.1" \ mysql_version_is_at_least "5.1.12" \ && [[ -n "${PBXT_VERSION}" ]] \ && PBXT_P=3D"pbxt-${PBXT_VERSION}" \ -&& PBXT_SRC_URI=3D"mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \ +&& PBXT_SRC_URI=3D"http://www.primebase.org/download/${PBXT_P}.tar.gz mi= rror://sourceforge/pbxt/${PBXT_P}.tar.gz" \ && SRC_URI=3D"${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \ && IUSE=3D"${IUSE} pbxt" =20 @@ -196,8 +196,10 @@ mysql_version_is_at_least "5.1.12" \ mysql_version_is_at_least "5.1.26" \ && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] \ && XTRADB_P=3D"percona-xtradb-${XTRADB_VER}" \ -&& XTRADB_SRC_URI=3D"http://www.percona.com/${PN}/xtradb/${PERCONA_VER}/= source/${XTRADB_P}.tar.gz" \ -&& SRC_URI=3D"${SRC_URI} xtradb? ( ${XTRADB_SRC_URI} )" \ +&& XTRADB_SRC_URI_COMMON=3D"${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \ +&& XTRADB_SRC_URI1=3D"http://www.percona.com/percona-builds/xtradb/${XTR= ADB_SRC_URI_COMMON}" \ +&& XTRADB_SRC_URI2=3D"http://www.percona.com/${PN}/xtradb/${XTRADB_SRC_U= RI_COMMON}" \ +&& SRC_URI=3D"${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2}= )" \ && IUSE=3D"${IUSE} xtradb" =20 # @@ -534,7 +536,7 @@ pbxt_src_configure() { AT_GNUCONF_UPDATE=3D"yes" eautoreconf =20 local myconf=3D"" - myconf=3D"${myconf} --with-mysql=3D${S} --libdir=3D${D}/${MY_LIBDIR}" + myconf=3D"${myconf} --with-mysql=3D${S} --libdir=3D${MY_LIBDIR}" use debug && myconf=3D"${myconf} --with-debug=3Dfull" # TODO: is it safe/needed to use econf here ? ./configure ${myconf} || die "Problem configuring PBXT storage engine" @@ -554,7 +556,7 @@ pbxt_src_compile() { =20 pbxt_src_install() { pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null - make install || die "Failed to install PBXT" + emake install DESTDIR=3D"${D}" || die "Failed to install PBXT" popd } =20 @@ -693,21 +695,22 @@ mysql_src_prepare() { i=3D"innobase" o=3D"${WORKDIR}/storage-${i}.mysql-upstream" # Have we been here already? - [ -h "${i}" ] && rm -f "${i}" + [ -d "${o}" ] && rm -f "${i}" # Or maybe we haven't [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" - ln -s "${WORKDIR}/${XTRADB_P}" "${i}" + cp -ra "${WORKDIR}/${XTRADB_P}" "${i}" popd fi =20 if mysql_version_is_at_least "5.1.12" ; then - einfo "Updating innobase cmake" rebuilddirlist=3D"." - # TODO: check this with a cmake expert - cmake \ - -DCMAKE_C_COMPILER=3D$(type -P $(tc-getCC)) \ - -DCMAKE_CXX_COMPILER=3D$(type -P $(tc-getCXX)) \ - "storage/innobase" + # This does not seem to be needed presently. robbat2 2010/02/23 + #einfo "Updating innobase cmake" + ## TODO: check this with a cmake expert + #cmake \ + # -DCMAKE_C_COMPILER=3D$(type -P $(tc-getCC)) \ + # -DCMAKE_CXX_COMPILER=3D$(type -P $(tc-getCXX)) \ + # "storage/innobase" else rebuilddirlist=3D". innobase" fi @@ -916,12 +919,12 @@ mysql_src_install() { "${S}"/support-files/magic \ "${S}"/support-files/ndb-config-2-node.ini do - dodoc "${script}" + [[ -f "$script" ]] && dodoc "${script}" done =20 docinto "scripts" for script in "${S}"/scripts/mysql* ; do - [[ "${script%.sh}" =3D=3D "${script}" ]] && dodoc "${script}" + [[ -f "$script" ]] && [[ "${script%.sh}" =3D=3D "${script}" ]] && dod= oc "${script}" done =20 fi