| 1 |
commit: 2f563dbcebb4bb42013c8e3d210fe61d252180e7 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 22 20:24:22 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 22 20:25:51 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f563dbc |
| 7 |
|
| 8 |
dev-db/mysql: rev bump |
| 9 |
|
| 10 |
- Fix mysql client: Use bundled libedit. |
| 11 |
|
| 12 |
- Handle forced LTO. |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 15 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 16 |
|
| 17 |
.../{mysql-8.0.19.ebuild => mysql-8.0.19-r1.ebuild} | 19 ++++++++++++++++--- |
| 18 |
1 file changed, 16 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-db/mysql/mysql-8.0.19.ebuild b/dev-db/mysql/mysql-8.0.19-r1.ebuild |
| 21 |
similarity index 99% |
| 22 |
rename from dev-db/mysql/mysql-8.0.19.ebuild |
| 23 |
rename to dev-db/mysql/mysql-8.0.19-r1.ebuild |
| 24 |
index 9d486bdb84a..c07e5f83866 100644 |
| 25 |
--- a/dev-db/mysql/mysql-8.0.19.ebuild |
| 26 |
+++ b/dev-db/mysql/mysql-8.0.19-r1.ebuild |
| 27 |
@@ -72,7 +72,7 @@ PATCHES=( |
| 28 |
# These are used for both runtime and compiletime |
| 29 |
COMMON_DEPEND=" |
| 30 |
>=app-arch/lz4-0_p131:= |
| 31 |
- dev-libs/libedit |
| 32 |
+ sys-libs/ncurses:0= |
| 33 |
>=sys-libs/zlib-1.2.3:0= |
| 34 |
libressl? ( dev-libs/libressl:0= ) |
| 35 |
!libressl? ( >=dev-libs/openssl-1.0.0:0= ) |
| 36 |
@@ -82,12 +82,12 @@ COMMON_DEPEND=" |
| 37 |
>=dev-libs/protobuf-3.8:= |
| 38 |
net-libs/libtirpc:= |
| 39 |
cjk? ( app-text/mecab:= ) |
| 40 |
+ jemalloc? ( dev-libs/jemalloc:0= ) |
| 41 |
kernel_linux? ( |
| 42 |
dev-libs/libaio:0= |
| 43 |
sys-process/procps:0= |
| 44 |
) |
| 45 |
numa? ( sys-process/numactl ) |
| 46 |
- jemalloc? ( dev-libs/jemalloc:0= ) |
| 47 |
tcmalloc? ( dev-util/google-perftools:0= ) |
| 48 |
) |
| 49 |
" |
| 50 |
@@ -239,7 +239,8 @@ src_configure(){ |
| 51 |
-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql" |
| 52 |
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}" |
| 53 |
-DWITH_UNIT_TESTS=$(usex test ON OFF) |
| 54 |
- -DWITH_EDITLINE=system |
| 55 |
+ # Using bundled editline to get CTRL+C working |
| 56 |
+ -DWITH_EDITLINE=bundled |
| 57 |
-DWITH_ZLIB=system |
| 58 |
-DWITH_SSL=system |
| 59 |
-DWITH_LIBWRAP=0 |
| 60 |
@@ -255,6 +256,18 @@ src_configure(){ |
| 61 |
-DWITH_BOOST="${S}/boost" |
| 62 |
-DWITH_ROUTER=$(usex router ON OFF) |
| 63 |
) |
| 64 |
+ |
| 65 |
+ if is-flagq -fno-lto ; then |
| 66 |
+ einfo "LTO disabled via {C,CXX,F,FC}FLAGS" |
| 67 |
+ mycmakeargs+=( -DWITH_LTO=OFF ) |
| 68 |
+ elif is-flagq -flto ; then |
| 69 |
+ einfo "LTO forced via {C,CXX,F,FC}FLAGS" |
| 70 |
+ myconf+=( -DWITH_LTO=ON ) |
| 71 |
+ else |
| 72 |
+ # Disable automagic |
| 73 |
+ myconf+=( -DWITH_LTO=OFF ) |
| 74 |
+ fi |
| 75 |
+ |
| 76 |
if use test ; then |
| 77 |
mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test ) |
| 78 |
else |
Archives