commit: 2e8b335ea682bf0204cebf6af208b60977e579ef Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Sun Apr 22 22:39:07 2018 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> 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.
