diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-25 11:50:47 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-25 11:50:47 +0000 |
| commit | d42200bec37eef2a7478d88988ff00addd0a9202 (patch) | |
| tree | 10394660b3cbe4b50173c06950b31302cd25d0d1 /dev-db/mysql | |
| parent | 580f05ea8f512d11e23e8da80177d27835cbdbbc (diff) | |
gentoo resync : 25.01.2020
Diffstat (limited to 'dev-db/mysql')
| -rw-r--r-- | dev-db/mysql/Manifest | 2 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-8.0.19-r1.ebuild (renamed from dev-db/mysql/mysql-8.0.19.ebuild) | 19 |
2 files changed, 17 insertions, 4 deletions
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 0b3957fda50f..6fc7245419b4 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -16,5 +16,5 @@ EBUILD mysql-5.6.44-r1.ebuild 27146 BLAKE2B f8afe1efcdaf08bf6529f931486e1ad97aef EBUILD mysql-5.6.45-r2.ebuild 27096 BLAKE2B 4185eba92b1d3455b2c9d718249a55e0a95b45f02f25ae5d65a9c3e01ad5de9bfe66793e63a2f577e3e7a9e295f40d7576070b356f6e2efcf493599f8569817e SHA512 faed98d09a85757cf2cede77fc21d83e059fcee33cfffd739f2dabe34ec905101840244f45c4bdf97f945abd79202c78b40f3b1dcc2f9edf10173741a3ea5b13 EBUILD mysql-5.7.26-r1.ebuild 31733 BLAKE2B d6e6f240727daae94a5d08773f1ec5046831c9b7faa605bcf685aac69c1a23b046a0bfba942e36779d9cbdfb616c9b847a2547b25673af7dcefc8839c6752710 SHA512 6dfe6baf03cf35e006677b7879d4c60705d57dc759608f17ac34eb0c747aa99844f7efe69c8d660dfb9863353d0ef390230972153e5901e7b527b8e59d9b4084 EBUILD mysql-5.7.27-r1.ebuild 31759 BLAKE2B 865bf492634cb00a3a373497501beeda472b477219960f012dcd74d5951e218904390039c17e5ff999a562cc12cb6bd58f0e2b0aa6efdb2e29f203171f04cecc SHA512 c0c7393a70d3be0129cba16694437f3017e97aa5f6cf8db63eb460d62ba06f5d3af8edbcb472d009f560e29ab837038dce4306bf2c2eb94f9ce026cae2204678 -EBUILD mysql-8.0.19.ebuild 36657 BLAKE2B 582e2845f196809ce1561c91c481d824af0d93ea969315ed9f0d89bfe4f21a80d69553d2714ff392bbde4c4ea44cd88581a82f96ab2def19147995c04a34620a SHA512 179a409bc1bad200a6a77a03997a1b576ee0a085637e360596f27d3364f4e795ff9a01bc784cce2450b54781f216f8a9f9971c2672bbdc7a5dbc2e07f22136e0 +EBUILD mysql-8.0.19-r1.ebuild 36980 BLAKE2B 91615a8226afde333febe3c4fc0200320a96db8b7e684c0c35a719e14b79eba026c088a80cb5c539bd029780869be9a4c92cf9c0b8eb0147aff71fa6cab09894 SHA512 e32b54b013d60919f4b4510a6f928fed842b3e8869824c3875d456a19b82fd56102a193316f7e4c8f9f6c7281e22f46165b43b108f3d4046843e45872b6cf069 MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7 diff --git a/dev-db/mysql/mysql-8.0.19.ebuild b/dev-db/mysql/mysql-8.0.19-r1.ebuild index 9d486bdb84a2..c07e5f83866c 100644 --- a/dev-db/mysql/mysql-8.0.19.ebuild +++ b/dev-db/mysql/mysql-8.0.19-r1.ebuild @@ -72,7 +72,7 @@ PATCHES=( # These are used for both runtime and compiletime COMMON_DEPEND=" >=app-arch/lz4-0_p131:= - dev-libs/libedit + sys-libs/ncurses:0= >=sys-libs/zlib-1.2.3:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-1.0.0:0= ) @@ -82,12 +82,12 @@ COMMON_DEPEND=" >=dev-libs/protobuf-3.8:= net-libs/libtirpc:= cjk? ( app-text/mecab:= ) + jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) numa? ( sys-process/numactl ) - jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) ) " @@ -239,7 +239,8 @@ src_configure(){ -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) - -DWITH_EDITLINE=system + # Using bundled editline to get CTRL+C working + -DWITH_EDITLINE=bundled -DWITH_ZLIB=system -DWITH_SSL=system -DWITH_LIBWRAP=0 @@ -255,6 +256,18 @@ src_configure(){ -DWITH_BOOST="${S}/boost" -DWITH_ROUTER=$(usex router ON OFF) ) + + if is-flagq -fno-lto ; then + einfo "LTO disabled via {C,CXX,F,FC}FLAGS" + mycmakeargs+=( -DWITH_LTO=OFF ) + elif is-flagq -flto ; then + einfo "LTO forced via {C,CXX,F,FC}FLAGS" + myconf+=( -DWITH_LTO=ON ) + else + # Disable automagic + myconf+=( -DWITH_LTO=OFF ) + fi + if use test ; then mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test ) else |