diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-28 20:02:04 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-28 20:02:04 +0100 |
| commit | a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch) | |
| tree | 852c90a4bf354c30ea66504f70bfab5401fba18d /dev-db/mysql | |
| parent | 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff) | |
gentoo resync : 28.04.2018
Diffstat (limited to 'dev-db/mysql')
| -rw-r--r-- | dev-db/mysql/Manifest | 2 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-5.7.22.ebuild | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index b70ac1dfccd6..ce808ed91c21 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -24,5 +24,5 @@ EBUILD mysql-5.6.37-r1.ebuild 6157 BLAKE2B e4dc21ce1095263789262ef65c5d70d53d20c EBUILD mysql-5.6.38.ebuild 6466 BLAKE2B c85ee0bd78a7b75a328a72120444277c9425886e06dc9134662669c73af4d1da45c6d49943f44fbe518379d0babd0590a3ae127f7552862aeb6eacbc18e6cd1c SHA512 e4272584a5de91df2b5f4fee2060e3ca3b5151472bc5e9d472004fdc213f0fc9527874958995bb039847f7f5da97047fc3e9b12f61cecdf03b9d3f65d707be78 EBUILD mysql-5.6.39.ebuild 6520 BLAKE2B d21e873fb57b7b311e7c06d680963794f1b7eb63c118a90aba8d4d036b0449c109e7c50c58a7616bf0b6545225f505fa5a6bcbcb3c0b095ba7c09dc3d296cc63 SHA512 e3c0b406a9c738d0474428c3007888d70832cd61c5a1d1bfad9ff9842f54c67f9494ca81e9647621b68a7e8ccb40af2ecc7fec4118538e569aeb58fe797c54e5 EBUILD mysql-5.6.40.ebuild 6526 BLAKE2B 08c92c74325dfab7d6106c3397129a5da95f52598185cf379985097f99e373cd9c0fbc0afa5a12643eb7212a10b63f1263eecb92556315943b59139d938cb7cb SHA512 2298baeeda2edf1d75e9a697e86428b81ded08fb58513942698e24ec4c8d16a295ed5abbc899faeb30bd5f3359f85bcde218c01020802727cf4816b7b447cd42 -EBUILD mysql-5.7.22.ebuild 26914 BLAKE2B 47d6b01bc57e585b60c3a808c6fc5766f94d8aa3962cc22860eebfc19779e5a1cff7820e428d0d0c4468e218afcda6b16403e792e96cdaeed3af8714ffc0f95f SHA512 8e5542bd793df5786a7b31addcb0d68c7435a4aab8ecf3e4fc6623ce883f9e7c0f3335e5ba06bb36957598ebbf59fbc70b4d63c745dc02f03eb6b44118b6cb5e +EBUILD mysql-5.7.22.ebuild 26980 BLAKE2B a2c3f202b3afdaa6567c149eebf53fec89199084734b79102374f160fcee19c053fe4e0879f222116eb74124e1324dafab7b3d9248dba1de487222b78863b9bf SHA512 44cfa62bdb399a0f9977a885f4401867c65a99f11fe9bfdf376088e43c3fd2df1abf44c1a618689a11705769290102d3b2de2aa38071c52910cebc9a2d7a6614 MISC metadata.xml 1916 BLAKE2B da2c681ac07c234aa7ecc6f52a1ed63bf49241f7cb270733d0acf523ae5c420bb8f91628bf8510f9365b137ddd63224fd9da6a00df976832947ce043da49a602 SHA512 eac8cb1f76264b46137794c7c47907579af51ac9184aba324f3951135f60dc58c642efdd0a7a3e5c438322f8de4066425ec306d0924472853413be2fd19cbaf9 diff --git a/dev-db/mysql/mysql-5.7.22.ebuild b/dev-db/mysql/mysql-5.7.22.ebuild index 5e447c166666..c833881e7bc3 100644 --- a/dev-db/mysql/mysql-5.7.22.ebuild +++ b/dev-db/mysql/mysql-5.7.22.ebuild @@ -207,6 +207,8 @@ src_prepare() { "${S}/cmake/ssl.cmake" || die fi + sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die + cmake-utils_src_prepare } @@ -273,6 +275,7 @@ multilib_src_configure() { -DWITH_RAPID=OFF -DWITH_LIBEVENT=NO -DWITH_CURL=system + -DWITH_BOOST="${S}/boost" ) if use test ; then mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test ) @@ -307,7 +310,6 @@ multilib_src_configure() { if multilib_is_native_abi && use server ; then mycmakeargs+=( - -DWITH_BOOST="${S}/boost" -DWITH_LZ4=system -DWITH_NUMA=$(usex numa ON OFF) ) |