commit:     15794394956f3ada8ea91b75fd52c3769f8c0b1d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  5 15:42:53 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec  5 15:43:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15794394

dev-db/percona-server: Rev bump to block package for >gcc-6

Bug: https://bugs.gentoo.org/639936
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 ...ebuild => percona-server-5.6.37.82.2-r2.ebuild} | 33 ++++++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/dev-db/percona-server/percona-server-5.6.37.82.2-r1.ebuild 
b/dev-db/percona-server/percona-server-5.6.37.82.2-r2.ebuild
similarity index 84%
rename from dev-db/percona-server/percona-server-5.6.37.82.2-r1.ebuild
rename to dev-db/percona-server/percona-server-5.6.37.82.2-r2.ebuild
index 5f0ae209006..1381d7da22c 100644
--- a/dev-db/percona-server/percona-server-5.6.37.82.2-r1.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.37.82.2-r2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 MY_EXTRAS_VER="20171121-1518Z"
 SUBSLOT="18"
 PYTHON_COMPAT=( python2_7 )
-inherit linux-info python-any-r1 mysql-multilib-r1
+inherit linux-info python-any-r1 mysql-multilib-r1 toolchain-funcs
 
 IUSE="numa pam tokudb tokudb-backup-plugin"
 
@@ -54,6 +54,15 @@ PATCHES=(
 pkg_pretend() {
        mysql-multilib-r1_pkg_pretend
 
+       if [[ ${MERGE_TYPE} != binary && tc-is-gcc ]]; then
+               if [[ $(gcc-major-version) -gt 6 ]]; then
+                       # https://bugs.gentoo.org/639936
+                       eerror "${P} is incompatible with >gcc-6.x."
+                       eerror "Please use gcc-config or package.env file to 
switch to <gcc-7.x for this package."
+                       die
+               fi
+       fi
+
        if use numa; then
                local CONFIG_CHECK="~NUMA"
 
@@ -196,8 +205,26 @@ multilib_src_test() {
        pushd "${TESTDIR}" || die
 
        # Set file limits higher so tests run
-       # Upper limit comes from parts.partition_* tests
-       ulimit -n 16500
+       if ! ulimit -n 16500 1>/dev/null 2>&1; then
+               # Upper limit comes from parts.partition_* tests
+               ewarn "For maximum test coverage please raise open file limit 
to 16500 (ulimit -n 16500) before calling the package manager."
+
+               if ! ulimit -n 4162 1>/dev/null 2>&1; then
+                       # Medium limit comes from '[Warning] Buffered warning: 
Could not increase number of max_open_files to more than 3000 (request: 4162)'
+                       ewarn "For medium test coverage please raise open file 
limit to 4162 (ulimit -n 4162) before calling the package manager."
+
+                       if ! ulimit -n 3000 1>/dev/null 2>&1; then
+                               ewarn "For minimum test coverage please raise 
open file limit to 3000 (ulimit -n 3000) before calling the package manager."
+                       else
+                               einfo "Will run test suite with open file limit 
set to 3000 (minimum test coverage)."
+                       fi
+               else
+                       einfo "Will run test suite with open file limit set to 
4162 (medium test coverage)."
+               fi
+       else
+               einfo "Will run test suite with open file limit set to 16500 
(best test coverage)."
+       fi
+
        python_setup
        # run mysql-test tests
        perl mysql-test-run.pl --force --vardir="${T}/var-tests" \

Reply via email to