| 1 |
commit: 22262ade2b169f4786c12125b2d0d9705f99c5a6 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 31 12:54:43 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 31 12:56:37 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22262ade |
| 7 |
|
| 8 |
dev-libs/apr-util: Reintroduced mysql support (bug #620230). |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
.../{apr-util-1.5.4-r2.ebuild => apr-util-1.5.4-r3.ebuild} | 11 +++++++++-- |
| 13 |
1 file changed, 9 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-libs/apr-util/apr-util-1.5.4-r2.ebuild b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild |
| 16 |
similarity index 91% |
| 17 |
rename from dev-libs/apr-util/apr-util-1.5.4-r2.ebuild |
| 18 |
rename to dev-libs/apr-util/apr-util-1.5.4-r3.ebuild |
| 19 |
index 3bb7a167d63..db5d7e6c1f0 100644 |
| 20 |
--- a/dev-libs/apr-util/apr-util-1.5.4-r2.ebuild |
| 21 |
+++ b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild |
| 22 |
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2" |
| 23 |
LICENSE="Apache-2.0" |
| 24 |
SLOT="1" |
| 25 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 26 |
-IUSE="berkdb doc freetds gdbm ldap libressl nss odbc openssl postgres sqlite static-libs" |
| 27 |
+IUSE="berkdb doc freetds gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs" |
| 28 |
#RESTRICT="test" |
| 29 |
|
| 30 |
RDEPEND=" |
| 31 |
@@ -26,6 +26,7 @@ RDEPEND=" |
| 32 |
freetds? ( dev-db/freetds ) |
| 33 |
gdbm? ( sys-libs/gdbm ) |
| 34 |
ldap? ( =net-nds/openldap-2* ) |
| 35 |
+ mysql? ( =virtual/mysql-5* ) |
| 36 |
nss? ( dev-libs/nss ) |
| 37 |
odbc? ( dev-db/unixODBC ) |
| 38 |
openssl? ( |
| 39 |
@@ -49,6 +50,12 @@ PATCHES=( |
| 40 |
|
| 41 |
src_prepare() { |
| 42 |
default |
| 43 |
+ |
| 44 |
+ # Fix usage of libmysqlclient (bug #620230) |
| 45 |
+ grep -lrF "libmysqlclient_r" "${S}" \ |
| 46 |
+ | xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \ |
| 47 |
+ || die |
| 48 |
+ |
| 49 |
mv configure.{in,ac} || die |
| 50 |
eautoreconf |
| 51 |
elibtoolize |
| 52 |
@@ -83,11 +90,11 @@ src_configure() { |
| 53 |
--datadir="${EPREFIX}"/usr/share/apr-util-1 |
| 54 |
--with-apr="${SYSROOT}${EPREFIX}"/usr |
| 55 |
--with-expat="${EPREFIX}"/usr |
| 56 |
- --without-mysql |
| 57 |
--without-sqlite2 |
| 58 |
$(use_with freetds) |
| 59 |
$(use_with gdbm) |
| 60 |
$(use_with ldap) |
| 61 |
+ $(use_with mysql) |
| 62 |
$(use_with nss) |
| 63 |
$(use_with odbc) |
| 64 |
$(use_with openssl) |
Archives