| 1 |
commit: 640b8e5b86ef37c4c8efcecefac7411ae7a0dc0a |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 23 00:33:29 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 23 00:33:29 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=640b8e5b |
| 7 |
|
| 8 |
dev-db/mysql: Respin patch for serverless installation on 5.7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/669236 |
| 11 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 13 |
|
| 14 |
dev-db/mysql/Manifest | 2 +- |
| 15 |
dev-db/mysql/mysql-5.7.23-r2.ebuild | 6 +++--- |
| 16 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest |
| 19 |
index abcd84f429f..763d1e2cb3b 100644 |
| 20 |
--- a/dev-db/mysql/Manifest |
| 21 |
+++ b/dev-db/mysql/Manifest |
| 22 |
@@ -3,4 +3,4 @@ DIST mysql-5.6.40.tar.gz 32083035 BLAKE2B efcc078341bae239df28ac0504111aa3492688 |
| 23 |
DIST mysql-5.6.41.tar.gz 32111985 BLAKE2B 5ccad59333525b354db4fa892857e237cddf8fe1a4d289c6e410c31d6142a71d3ce4dab8d954fa9932ec1f83b50e8eccd5845e082deaaa56f1c0c5e21b2ce6c0 SHA512 a62d7a68c6bb49de33f8c9e634bce53cb453a87238e92967115e8e928fa9ed291727b8bd5a5271a0b5b634d957eb310c745edfb14b6be1deb9099bb757aa2cff |
| 24 |
DIST mysql-boost-5.7.23.tar.gz 49025014 BLAKE2B 669f10779bc2cda866d6bd876b4efe55fb4b0c796f596f66513a3ca85f322e2a03e9879eecd72a69729a0cb71d408c46cdd9086ae456712b4adff6ae7c584c97 SHA512 e4317f89d108a68652cd95e41ffd670c37b6663aabd6af3985d18052fb7e8d8879b5822399caf9091cecc0a949ec588c121c87cfd60d69941f68d0ecbedd0953 |
| 25 |
DIST mysql-extras-20180804-2323Z.tar.bz2 322215 BLAKE2B cca9e502e375bf43473335868517f6c450fc7bcf03e55de5a294c8bdcfcac2bb783dec09bbb3b6c30a561ba7e3a943543c017e2d42b61d466e699acdef4c0231 SHA512 efd9d416f394cc61b977ab76f05ab3acc5803ff8bdee8e1dbc65cc5b3f07e4f9742140d9586c028908b10fcc44f21c98ebffdebcc5c3578acbe05b07526bcb3d |
| 26 |
-DIST mysql-extras-20181017-2201Z.tar.bz2 328311 BLAKE2B f1b179e0f2d63105f03ba238125e6cfa2c0cbf2084251b6c344bd02517899322bd161470eddab28c514349caac6401c35909b2f37264fdaf2dc196a309d3cc27 SHA512 26e26a3ad926bc9267d89f0bc34b030bc6292f21d3007185c4c1155beaa608566b4268f93edb64fd6156dbae80ac4f2817e78c1e92e90985e2675c2b1f97854e |
| 27 |
+DIST mysql-extras-20181023-0012Z.tar.bz2 327834 BLAKE2B 91a82cbcecbbbe94933da0d8c26cdfee0171602785b2f717fbfec7da422f0ec36f26e897a3c21695f4748017d36c9956cbef03d0852246468368b812a604df82 SHA512 94996708a9da4d55c3aab74f75b74fa4aa80e3fbbb87d9dfe6c1596a934aceed466b7c853e38d9b63f59660763ccef617defc4e6e8770451c21a252250f4e7fa |
| 28 |
|
| 29 |
diff --git a/dev-db/mysql/mysql-5.7.23-r2.ebuild b/dev-db/mysql/mysql-5.7.23-r2.ebuild |
| 30 |
index a291cfbf34a..24448702305 100644 |
| 31 |
--- a/dev-db/mysql/mysql-5.7.23-r2.ebuild |
| 32 |
+++ b/dev-db/mysql/mysql-5.7.23-r2.ebuild |
| 33 |
@@ -2,7 +2,7 @@ |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
|
| 36 |
EAPI="6" |
| 37 |
-MY_EXTRAS_VER="20181017-2201Z" |
| 38 |
+MY_EXTRAS_VER="20181023-0012Z" |
| 39 |
|
| 40 |
CMAKE_MAKEFILE_GENERATOR=emake |
| 41 |
|
| 42 |
@@ -51,7 +51,7 @@ else |
| 43 |
fi |
| 44 |
|
| 45 |
PATCHES=( |
| 46 |
- "${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.7.patch |
| 47 |
+ "${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.7.23.patch |
| 48 |
"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.7.patch |
| 49 |
"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.7.10.patch |
| 50 |
"${MY_PATCH_DIR}"/20018_all_mysql-5.7.21-without-clientlibs-tools.patch |
| 51 |
@@ -362,7 +362,6 @@ multilib_src_configure() { |
| 52 |
-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) |
| 53 |
-DWITH_CURL=system |
| 54 |
-DWITH_BOOST="${S}/boost" |
| 55 |
- -DWITH_PROTOBUF=system |
| 56 |
) |
| 57 |
if use test ; then |
| 58 |
mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test ) |
| 59 |
@@ -398,6 +397,7 @@ multilib_src_configure() { |
| 60 |
mycmakeargs+=( |
| 61 |
-DWITH_LIBEVENT=system |
| 62 |
-DWITH_LZ4=system |
| 63 |
+ -DWITH_PROTOBUF=system |
| 64 |
-DWITH_MECAB=$(usex cjk system OFF) |
| 65 |
-DWITH_NUMA=$(usex numa ON OFF) |
| 66 |
-DWITH_RAPID=$(usex experimental ON OFF) |
Archives