From 037d7629abe09d14a5c01f69c7e2ca2c8e15b29b Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Tue, 18 Jul 2017 22:37:00 -0400 Subject: dev-db/mariadb: Fix multilib symlinks Package-Manager: Portage-2.3.6, Repoman-2.3.3 Manifest-Sign-Key: 0xD1F781EFF9F4A3B6 --- dev-db/mariadb/mariadb-10.2.7.ebuild | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.2.7.ebuild b/dev-db/mariadb/mariadb-10.2.7.ebuild index ff19ca8..2c2b865 100644 --- a/dev-db/mariadb/mariadb-10.2.7.ebuild +++ b/dev-db/mariadb/mariadb-10.2.7.ebuild @@ -220,6 +220,14 @@ multilib_src_install() { insinto /usr/include/mysql/private doins "${S}"/sql/*.h fi + + # Install compatible symlinks to libmysqlclient + use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a" + dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so" + dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}" + + # Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them. + find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die } multilib_src_install_all() { @@ -306,11 +314,6 @@ multilib_src_install_all() { #Remove mytop if perl is not selected [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop" - - # Install compatible symlinks to libmysqlclient - use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a" - dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so" - dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}" } # Official test instructions: -- cgit v1.2.3-65-gdbad