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 7015C1382C5 for ; Sun, 22 Apr 2018 22:39:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD2B2E0835; Sun, 22 Apr 2018 22:39:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 866CEE0835 for ; Sun, 22 Apr 2018 22:39:26 +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 477C6335C36 for ; Sun, 22 Apr 2018 22:39:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4960E27C for ; Sun, 22 Apr 2018 22:39:23 +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: <1524436747.2e8b335ea682bf0204cebf6af208b60977e579ef.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mariadb/mariadb-10.2.12.ebuild dev-db/mariadb/mariadb-10.2.13.ebuild dev-db/mariadb/mariadb-10.2.14.ebuild dev-db/mariadb/mariadb-10.3.5_rc.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 2e8b335ea682bf0204cebf6af208b60977e579ef X-VCS-Branch: master Date: Sun, 22 Apr 2018 22:39:23 +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: 820f3e33-33f4-49ea-8b29-50afa016c8cc X-Archives-Hash: 7dbabaff897044b881ad5a49ee2e9b1d commit: 2e8b335ea682bf0204cebf6af208b60977e579ef Author: Brian Evans gentoo org> AuthorDate: Sun Apr 22 22:39:07 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Sun Apr 22 22:39:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e8b335e dev-db/mariadb: QA: Fix prefix support for double EPREFIX Closes: https://bugs.gentoo.org/644108 Package-Manager: Portage-2.3.31, Repoman-2.3.9 dev-db/mariadb/mariadb-10.2.12.ebuild | 10 +++++----- dev-db/mariadb/mariadb-10.2.13.ebuild | 10 +++++----- dev-db/mariadb/mariadb-10.2.14.ebuild | 10 +++++----- dev-db/mariadb/mariadb-10.3.5_rc.ebuild | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.2.12.ebuild b/dev-db/mariadb/mariadb-10.2.12.ebuild index 29a68b7734c..73d4cd9e20e 100644 --- a/dev-db/mariadb/mariadb-10.2.12.ebuild +++ b/dev-db/mariadb/mariadb-10.2.12.ebuild @@ -504,8 +504,8 @@ multilib_src_install() { mysql_init_vars # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used - if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then - rm "${D}/usr/include/mysql/server/private/config.h" || die + if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then + rm "${ED}/usr/include/mysql/server/private/config.h" || die fi if ! multilib_is_native_abi && use server ; then @@ -514,9 +514,9 @@ multilib_src_install() { 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}" +# use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a" +# dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so" + dosym libmariadb.so.3 "/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 diff --git a/dev-db/mariadb/mariadb-10.2.13.ebuild b/dev-db/mariadb/mariadb-10.2.13.ebuild index c9a11e7250c..2eff8c74630 100644 --- a/dev-db/mariadb/mariadb-10.2.13.ebuild +++ b/dev-db/mariadb/mariadb-10.2.13.ebuild @@ -534,8 +534,8 @@ multilib_src_install() { cmake-utils_src_install # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used - if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then - rm "${D}/usr/include/mysql/server/private/config.h" || die + if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then + rm "${ED}/usr/include/mysql/server/private/config.h" || die fi if ! multilib_is_native_abi && use server ; then @@ -545,9 +545,9 @@ multilib_src_install() { if use client-libs ; then # 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}" +# use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a" +# dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so" + dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}" fi # Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them. diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.14.ebuild index 86c88b6342e..3c62b609a1e 100644 --- a/dev-db/mariadb/mariadb-10.2.14.ebuild +++ b/dev-db/mariadb/mariadb-10.2.14.ebuild @@ -532,8 +532,8 @@ multilib_src_install() { cmake-utils_src_install # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used - if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then - rm "${D}/usr/include/mysql/server/private/config.h" || die + if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then + rm "${ED}/usr/include/mysql/server/private/config.h" || die fi if ! multilib_is_native_abi && use server ; then @@ -543,9 +543,9 @@ multilib_src_install() { if use client-libs ; then # 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}" +# use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a" +# dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so" + dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}" fi # Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them. diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild index 33cd1b5332c..69e55e88ddc 100644 --- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild +++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild @@ -536,8 +536,8 @@ multilib_src_install() { mysql_init_vars # Remove an unnecessary, private config header which will never match between ABIs and is not meant to be used - if [[ -f "${D}/usr/include/mysql/server/private/config.h" ]] ; then - rm "${D}/usr/include/mysql/server/private/config.h" || die + if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then + rm "${ED}/usr/include/mysql/server/private/config.h" || die fi if ! multilib_is_native_abi && use server ; then @@ -547,9 +547,9 @@ multilib_src_install() { if use client-libs ; then # 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}" +# use static-libs && dosym libmariadbclient.a "/usr/$(get_libdir)/libmysqlclient.a" +# dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so" + dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}" fi # Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.