diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
commit | a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch) | |
tree | 8c764c1cc0576389ce22abd317bceba71ea5732d /dev-db/mysql/mysql-5.7.30-r1.ebuild | |
parent | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff) |
gentoo resync : 04.05.2021
Diffstat (limited to 'dev-db/mysql/mysql-5.7.30-r1.ebuild')
-rw-r--r-- | dev-db/mysql/mysql-5.7.30-r1.ebuild | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/dev-db/mysql/mysql-5.7.30-r1.ebuild b/dev-db/mysql/mysql-5.7.30-r1.ebuild index 59e0d821600f..8df5b377bb6f 100644 --- a/dev-db/mysql/mysql-5.7.30-r1.ebuild +++ b/dev-db/mysql/mysql-5.7.30-r1.ebuild @@ -22,11 +22,10 @@ HOMEPAGE="https://www.mysql.com/" DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" LICENSE="GPL-2" SLOT="5.7/18" -IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling +IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 numa +perl profiling selinux +server static static-libs systemtap tcmalloc test" -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests -RESTRICT="!test? ( test ) libressl? ( test )" +RESTRICT="!test? ( test )" REQUIRED_USE="?? ( tcmalloc jemalloc )" @@ -66,12 +65,10 @@ COMMON_DEPEND="net-misc/curl:= systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) client-libs? ( - !libressl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] ) + >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] ) !client-libs? ( - !libressl? ( >=dev-libs/openssl-1.0.0:0= ) - libressl? ( dev-libs/libressl:0= ) + >=dev-libs/openssl-1.0.0:0= ) " DEPEND="${COMMON_DEPEND} @@ -280,11 +277,6 @@ src_prepare() { man/zlib_decompress.1 \ || die - if use libressl ; then - sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ - "${S}/cmake/ssl.cmake" || die - fi - sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die } |