From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E1C27139694 for ; Wed, 19 Jul 2017 02:37:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED1D8E0DC0; Wed, 19 Jul 2017 02:37:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CBDA7E0DC0 for ; Wed, 19 Jul 2017 02:37:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BBF3F341833 for ; Wed, 19 Jul 2017 02:37:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8085B74A5 for ; Wed, 19 Jul 2017 02:37:12 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1500431820.037d7629abe09d14a5c01f69c7e2ca2c8e15b29b.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mariadb/mariadb-10.2.7.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 037d7629abe09d14a5c01f69c7e2ca2c8e15b29b X-VCS-Branch: master Date: Wed, 19 Jul 2017 02:37:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 662bfb33-4664-40b4-869f-80f49aa0be2d X-Archives-Hash: a76604ae029eb9c9f12665162064c76e commit: 037d7629abe09d14a5c01f69c7e2ca2c8e15b29b Author: Brian Evans gentoo org> AuthorDate: Wed Jul 19 02:37:00 2017 +0000 Commit: Brian Evans gentoo org> CommitDate: Wed Jul 19 02:37:00 2017 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=037d7629 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: