diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2010-01-11 08:22:00 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2010-01-11 08:22:00 +0000 |
| commit | 23e1fbebeb0eae1a02834e2d5d1cf16ad7468ba2 (patch) | |
| tree | 732f8a402795f79e169dc55e9c89cc02dd4363a5 /www-apache | |
| parent | unmask www-apps/joomla again, see discussion on bug 204335 (diff) | |
| download | gentoo-2-23e1fbebeb0eae1a02834e2d5d1cf16ad7468ba2.tar.gz gentoo-2-23e1fbebeb0eae1a02834e2d5d1cf16ad7468ba2.tar.bz2 gentoo-2-23e1fbebeb0eae1a02834e2d5d1cf16ad7468ba2.zip | |
link with libmysqlclient_r wrt #290941
(Portage version: 2.2_rc61/cvs/Linux i686)
Diffstat (limited to 'www-apache')
| -rw-r--r-- | www-apache/mod_auth_mysql/ChangeLog | 8 | ||||
| -rw-r--r-- | www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild | 15 |
2 files changed, 14 insertions, 9 deletions
diff --git a/www-apache/mod_auth_mysql/ChangeLog b/www-apache/mod_auth_mysql/ChangeLog index b4ac2278cf4c..e087f1e1fef1 100644 --- a/www-apache/mod_auth_mysql/ChangeLog +++ b/www-apache/mod_auth_mysql/ChangeLog @@ -1,12 +1,16 @@ # ChangeLog for www-apache/mod_auth_mysql -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/ChangeLog,v 1.7 2008/01/31 17:02:55 hollow Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/ChangeLog,v 1.8 2010/01/11 08:22:00 hollow Exp $ 07 Dec 2006; Luca Longinotti <chtekk@gentoo.org> -files/12_mod_auth_mysql.conf, -files/mod_auth_mysql.patch, metadata.xml, -mod_auth_mysql-3.0.0.ebuild, mod_auth_mysql-3.0.0-r1.ebuild: Ebuild cleanup, set mysql as herd too. + 11 Jan 2010; Benedikt Böhm <hollow@gentoo.org> + mod_auth_mysql-3.0.0-r2.ebuild: + link with libmysqlclient_r wrt #290941 + 31 Jan 2008; Benedikt Böhm <hollow@gentoo.org> files/12_mod_auth_mysql.conf: cleanup diff --git a/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild b/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild index 486cd23ce283..170c7ef87a77 100644 --- a/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild +++ b/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild,v 1.5 2007/11/25 14:59:05 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild,v 1.6 2010/01/11 08:22:00 hollow Exp $ + +EAPI="2" inherit apache-module eutils @@ -17,7 +19,7 @@ DEPEND="virtual/mysql sys-libs/zlib" RDEPEND="${DEPEND}" -APXS2_ARGS="-c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c" +APXS2_ARGS="-c -I/usr/include/mysql -lmysqlclient_r -lm -lz ${PN}.c" APACHE2_MOD_CONF="12_${PN}" APACHE2_MOD_DEFINE="AUTH_MYSQL" @@ -25,8 +27,7 @@ DOCFILES="README CONFIGURE" need_apache2_2 -src_unpack() { - unpack ${A} - EPATCH_OPTS="-d ${S} -p1" epatch "${FILESDIR}/${P}-apache-2.2.patch" - EPATCH_OPTS="-d ${S} -p1" epatch "${FILESDIR}/${P}-htpasswd2-auth-style.patch" +src_prepare() { + epatch "${FILESDIR}/${P}-apache-2.2.patch" + epatch "${FILESDIR}/${P}-htpasswd2-auth-style.patch" } |