diff options
author | 2022-05-17 01:48:55 +0000 | |
---|---|---|
committer | 2022-05-17 05:33:54 +0000 | |
commit | 669aa39c6f876b0d851e3704f97153a6dc1bdf93 (patch) | |
tree | 7ec99ba9e426b43d307ff0d7c068113df9f6a2c9 /dev-db | |
parent | dev-db/cockroach: [QA] drop (very) stale GCC version checks (diff) | |
download | gentoo-669aa39c6f876b0d851e3704f97153a6dc1bdf93.tar.gz gentoo-669aa39c6f876b0d851e3704f97153a6dc1bdf93.tar.bz2 gentoo-669aa39c6f876b0d851e3704f97153a6dc1bdf93.zip |
dev-db/mariadb: [QA] drop (very) stale GCC version checks
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/mariadb/mariadb-10.2.41.ebuild | 23 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.3.32.ebuild | 23 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.4.22.ebuild | 23 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.5.13.ebuild | 16 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.5.15.ebuild | 16 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.6.5-r1.ebuild | 16 |
6 files changed, 6 insertions, 111 deletions
diff --git a/dev-db/mariadb/mariadb-10.2.41.ebuild b/dev-db/mariadb/mariadb-10.2.41.ebuild index 64caa78b49b3..43001d345c8a 100644 --- a/dev-db/mariadb/mariadb-10.2.41.ebuild +++ b/dev-db/mariadb/mariadb-10.2.41.ebuild @@ -81,9 +81,7 @@ COMMON_DEPEND=" >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= " -BDEPEND="virtual/yacc - || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) -" +BDEPEND="virtual/yacc" DEPEND="static? ( sys-libs/ncurses[static-libs] ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) @@ -185,25 +183,6 @@ mysql_init_vars() { pkg_setup() { if [[ ${MERGE_TYPE} != binary ]] ; then - local GCC_MAJOR_SET=$(gcc-major-version) - local GCC_MINOR_SET=$(gcc-minor-version) - - if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ - ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then - eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." - eerror "Please use gcc-config to switch to gcc-4.7 or later version." - die - fi - - # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on - # non x86{,_64} arches - if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ - ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then - eerror "${PN} needs to be built with gcc-4.7 or later." - eerror "Please use gcc-config to switch to gcc-4.7 or later version." - die - fi - if has test ${FEATURES} ; then # Bug #213475 - MySQL _will_ object strenuously if your machine is named # localhost. Also causes weird failures. diff --git a/dev-db/mariadb/mariadb-10.3.32.ebuild b/dev-db/mariadb/mariadb-10.3.32.ebuild index 929fb71bf3fd..b87897821608 100644 --- a/dev-db/mariadb/mariadb-10.3.32.ebuild +++ b/dev-db/mariadb/mariadb-10.3.32.ebuild @@ -81,9 +81,7 @@ COMMON_DEPEND=" >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= " -BDEPEND="virtual/yacc - || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) -" +BDEPEND="virtual/yacc" DEPEND="static? ( sys-libs/ncurses[static-libs] ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) @@ -176,25 +174,6 @@ mysql_init_vars() { pkg_setup() { if [[ ${MERGE_TYPE} != binary ]] ; then - local GCC_MAJOR_SET=$(gcc-major-version) - local GCC_MINOR_SET=$(gcc-minor-version) - - if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ - ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then - eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." - eerror "Please use gcc-config to switch to gcc-4.7 or later version." - die - fi - - # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on - # non x86{,_64} arches - if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ - ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then - eerror "${PN} needs to be built with gcc-4.7 or later." - eerror "Please use gcc-config to switch to gcc-4.7 or later version." - die - fi - if has test ${FEATURES} ; then # Bug #213475 - MySQL _will_ object strenuously if your machine is named # localhost. Also causes weird failures. diff --git a/dev-db/mariadb/mariadb-10.4.22.ebuild b/dev-db/mariadb/mariadb-10.4.22.ebuild index 96db7019ac60..14def683d3a6 100644 --- a/dev-db/mariadb/mariadb-10.4.22.ebuild +++ b/dev-db/mariadb/mariadb-10.4.22.ebuild @@ -81,9 +81,7 @@ COMMON_DEPEND=" >=dev-libs/libpcre-8.41-r1:3= virtual/libcrypt:= " -BDEPEND="virtual/yacc - || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) -" +BDEPEND="virtual/yacc" DEPEND="static? ( sys-libs/ncurses[static-libs] ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) @@ -177,25 +175,6 @@ mysql_init_vars() { pkg_setup() { if [[ ${MERGE_TYPE} != binary ]] ; then - local GCC_MAJOR_SET=$(gcc-major-version) - local GCC_MINOR_SET=$(gcc-minor-version) - - if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \ - ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then - eerror "${PN} with tokudb needs to be built with gcc-4.7 or later." - eerror "Please use gcc-config to switch to gcc-4.7 or later version." - die - fi - - # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on - # non x86{,_64} arches - if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ - ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then - eerror "${PN} needs to be built with gcc-4.7 or later." - eerror "Please use gcc-config to switch to gcc-4.7 or later version." - die - fi - if has test ${FEATURES} ; then # Bug #213475 - MySQL _will_ object strenuously if your machine is named # localhost. Also causes weird failures. diff --git a/dev-db/mariadb/mariadb-10.5.13.ebuild b/dev-db/mariadb/mariadb-10.5.13.ebuild index 195bd0b0ceda..cac5f2acfa61 100644 --- a/dev-db/mariadb/mariadb-10.5.13.ebuild +++ b/dev-db/mariadb/mariadb-10.5.13.ebuild @@ -87,9 +87,7 @@ COMMON_DEPEND=" >=dev-libs/openssl-1.0.0:0= ) " -BDEPEND="virtual/yacc - || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) -" +BDEPEND="virtual/yacc" DEPEND="${COMMON_DEPEND} server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) @@ -185,18 +183,6 @@ mysql_init_vars() { pkg_setup() { if [[ ${MERGE_TYPE} != binary ]] ; then - local GCC_MAJOR_SET=$(gcc-major-version) - local GCC_MINOR_SET=$(gcc-minor-version) - - # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on - # non x86{,_64} arches - if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ - ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then - eerror "${PN} needs to be built with gcc-4.7 or later." - eerror "Please use gcc-config to switch to gcc-4.7 or later version." - die - fi - if has test ${FEATURES} ; then # Bug #213475 - MySQL _will_ object strenuously if your machine is named # localhost. Also causes weird failures. diff --git a/dev-db/mariadb/mariadb-10.5.15.ebuild b/dev-db/mariadb/mariadb-10.5.15.ebuild index 34b1fb9c1940..5f5be0b5ce09 100644 --- a/dev-db/mariadb/mariadb-10.5.15.ebuild +++ b/dev-db/mariadb/mariadb-10.5.15.ebuild @@ -87,9 +87,7 @@ COMMON_DEPEND=" >=dev-libs/openssl-1.0.0:0= ) " -BDEPEND="virtual/yacc - || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) -" +BDEPEND="virtual/yacc" DEPEND="${COMMON_DEPEND} server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) @@ -185,18 +183,6 @@ mysql_init_vars() { pkg_setup() { if [[ ${MERGE_TYPE} != binary ]] ; then - local GCC_MAJOR_SET=$(gcc-major-version) - local GCC_MINOR_SET=$(gcc-minor-version) - - # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on - # non x86{,_64} arches - if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ - ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then - eerror "${PN} needs to be built with gcc-4.7 or later." - eerror "Please use gcc-config to switch to gcc-4.7 or later version." - die - fi - if has test ${FEATURES} ; then # Bug #213475 - MySQL _will_ object strenuously if your machine is named # localhost. Also causes weird failures. diff --git a/dev-db/mariadb/mariadb-10.6.5-r1.ebuild b/dev-db/mariadb/mariadb-10.6.5-r1.ebuild index c7d56f50f725..0d12908c713b 100644 --- a/dev-db/mariadb/mariadb-10.6.5-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.6.5-r1.ebuild @@ -87,9 +87,7 @@ COMMON_DEPEND=" >=dev-libs/openssl-1.0.0:0= ) " -BDEPEND="virtual/yacc - || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) -" +BDEPEND="virtual/yacc" DEPEND="${COMMON_DEPEND} server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.8 ) ) @@ -185,18 +183,6 @@ mysql_init_vars() { pkg_setup() { if [[ ${MERGE_TYPE} != binary ]] ; then - local GCC_MAJOR_SET=$(gcc-major-version) - local GCC_MINOR_SET=$(gcc-minor-version) - - # Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on - # non x86{,_64} arches - if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \ - ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then - eerror "${PN} needs to be built with gcc-4.7 or later." - eerror "Please use gcc-config to switch to gcc-4.7 or later version." - die - fi - if has test ${FEATURES} ; then # Bug #213475 - MySQL _will_ object strenuously if your machine is named # localhost. Also causes weird failures. |