Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/
Date: Sun, 18 Aug 2019 12:35:00
Message-Id: 1566131686.dee630c7fee42ae9196065e93bbd61cff34194de.whissi@gentoo
1 commit: dee630c7fee42ae9196065e93bbd61cff34194de
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 18 12:33:13 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 18 12:34:46 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee630c7
7
8 dev-db/mysql: using SSL is mandatory
9
10 Closes: https://bugs.gentoo.org/692390
11 Package-Manager: Portage-2.3.71, Repoman-2.3.17
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 dev-db/mysql/mysql-8.0.17.ebuild | 11 ++++-------
15 1 file changed, 4 insertions(+), 7 deletions(-)
16
17 diff --git a/dev-db/mysql/mysql-8.0.17.ebuild b/dev-db/mysql/mysql-8.0.17.ebuild
18 index df67c9534ad..9bf70ba0f6b 100644
19 --- a/dev-db/mysql/mysql-8.0.17.ebuild
20 +++ b/dev-db/mysql/mysql-8.0.17.ebuild
21 @@ -30,7 +30,7 @@ DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
22 LICENSE="GPL-2"
23 SLOT="0"
24 IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
25 - router selinux ssl tcmalloc test"
26 + router selinux tcmalloc test"
27
28 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
29 RESTRICT="libressl? ( test )"
30 @@ -77,10 +77,8 @@ COMMON_DEPEND="
31 sys-process/procps:0=
32 )
33 numa? ( sys-process/numactl )
34 - ssl? (
35 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
36 - libressl? ( dev-libs/libressl:0= )
37 - )
38 + !libressl? ( >=dev-libs/openssl-1.0.0:0= )
39 + libressl? ( dev-libs/libressl:0= )
40 tcmalloc? ( dev-util/google-perftools:0= )
41 "
42 DEPEND="${COMMON_DEPEND}
43 @@ -224,10 +222,9 @@ src_configure(){
44 -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
45 -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
46 -DWITH_UNIT_TESTS=$(usex test ON OFF)
47 - ### TODO: make this system but issues with UTF-8 prevent it
48 -DWITH_EDITLINE=system
49 -DWITH_ZLIB=system
50 - -DWITH_SSL=$(usex ssl system wolfssl)
51 + -DWITH_SSL=system
52 -DWITH_LIBWRAP=0
53 -DENABLED_LOCAL_INFILE=1
54 -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"