Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/
Date: Thu, 01 Mar 2018 02:06:38
Message-Id: 1519869772.be9140b74fdeb63a8451b3ffcc4037f0f45b1655.grknight@gentoo
1 commit: be9140b74fdeb63a8451b3ffcc4037f0f45b1655
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 1 02:02:52 2018 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 1 02:02:52 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be9140b7
7
8 dev-db/mariadb: Fix file collision from previous commit
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 dev-db/mariadb/mariadb-10.3.5_rc.ebuild | 2 ++
13 1 file changed, 2 insertions(+)
14
15 diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
16 index 1d5e58bace4..fd3d65af594 100644
17 --- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
18 +++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
19 @@ -542,10 +542,12 @@ multilib_src_install() {
20 doins "${S}"/sql/*.h
21 fi
22
23 + if use client-libs ; then
24 # Install compatible symlinks to libmysqlclient
25 # use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
26 # dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
27 dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
28 + fi
29
30 # Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
31 find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die