diff options
| author |   Christian Heim <phreak@gentoo.org> | 2007-07-08 20:21:20 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2007-07-08 20:21:20 +0000 |
| commit | 9d563bd32b428913fae682ef4ede4ee7083aee1d (patch) | |
| tree | 976332d0d0dfcc4338b1c46b6e6654ecfa7d97b5 /dev-libs | |
| parent | Package.use.mask mysql for dev-libs/apr-util. (diff) | |
| download | gentoo-2-9d563bd32b428913fae682ef4ede4ee7083aee1d.tar.gz gentoo-2-9d563bd32b428913fae682ef4ede4ee7083aee1d.tar.bz2 gentoo-2-9d563bd32b428913fae682ef4ede4ee7083aee1d.zip | |
Fix the compilation issue with mysql (#184636 - Rajiv Aaron Manglani <rajiv at gentoo.org>), as apr_dbd_mysql needs mysql-5*.
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/apr-util/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/apr-util/apr-util-1.2.8-r1.ebuild | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog index 7d5a2d83274c..0c15606e180b 100644 --- a/dev-libs/apr-util/ChangeLog +++ b/dev-libs/apr-util/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/apr-util # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.88 2007/06/28 13:06:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.89 2007/07/08 20:21:20 phreak Exp $ + + 08 Jul 2007; Christian Heim <phreak@gentoo.org> apr-util-1.2.8-r1.ebuild: + Fix the compilation issue with mysql (#184636 - Rajiv Aaron Manglani <rajiv + at gentoo.org>), as apr_dbd_mysql needs mysql-5*. 28 Jun 2007; Raúl Porcel <armin76@gentoo.org> apr-util-0.9.12-r1.ebuild: ia64 stable wrt #178750 diff --git a/dev-libs/apr-util/apr-util-1.2.8-r1.ebuild b/dev-libs/apr-util/apr-util-1.2.8-r1.ebuild index 43ca832ba45d..5c8b3d3e3091 100644 --- a/dev-libs/apr-util/apr-util-1.2.8-r1.ebuild +++ b/dev-libs/apr-util/apr-util-1.2.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.8-r1.ebuild,v 1.1 2007/06/15 17:59:22 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.8-r1.ebuild,v 1.2 2007/07/08 20:21:20 phreak Exp $ inherit autotools eutils flag-o-matic libtool db-use @@ -10,7 +10,7 @@ DESCRIPTION="Apache Portable Runtime Library" HOMEPAGE="http://apr.apache.org/" SRC_URI="mirror://apache/apr/${P}.tar.gz mirror://apache/apr/apr-${PV}.tar.gz - mirror://gentoo/apr_dbd_mysql-r${DBD_MYSQL}.c" + mysql? ( mirror://gentoo/apr_dbd_mysql-r${DBD_MYSQL}.c )" LICENSE="Apache-2.0" SLOT="1" @@ -23,6 +23,7 @@ DEPEND="dev-libs/expat berkdb? ( =sys-libs/db-4* ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) + mysql? ( =virtual/mysql-5* ) postgres? ( dev-db/libpq ) sqlite? ( =dev-db/sqlite-2* ) sqlite3? ( =dev-db/sqlite-3* )" @@ -31,8 +32,10 @@ src_unpack() { unpack ${A} cd "${S}" - cp "${DISTDIR}"/apr_dbd_mysql-r${DBD_MYSQL}.c \ - "${S}"/dbd/apr_dbd_mysql.c || die "could not copy mysql driver" + if use mysql ; then + cp "${DISTDIR}"/apr_dbd_mysql-r${DBD_MYSQL}.c \ + "${S}"/dbd/apr_dbd_mysql.c || die "could not copy mysql driver" + fi ./buildconf --with-apr=../apr-${PV} || die "buildconf failed" elibtoolize || die "elibtoolize failed" |