| 1 |
commit: 2f31b06fc03eb05e3aa3089c7e5cf3c01a107ae0 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 29 19:52:38 2016 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 29 19:52:38 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=2f31b06f |
| 7 |
|
| 8 |
dev-db/mysql: Force a download of boost-1.59 and use it in the build. Only a portion is actually used |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
Manifest-Sign-Key: D1F781EFF9F4A3B6 |
| 12 |
|
| 13 |
dev-db/mysql/ChangeLog | 4 ++++ |
| 14 |
dev-db/mysql/Manifest | 23 +---------------------- |
| 15 |
dev-db/mysql/mysql-5.7.12.ebuild | 8 +++----- |
| 16 |
3 files changed, 8 insertions(+), 27 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog |
| 19 |
index 52551b5..d98dac7 100644 |
| 20 |
--- a/dev-db/mysql/ChangeLog |
| 21 |
+++ b/dev-db/mysql/ChangeLog |
| 22 |
@@ -2,6 +2,10 @@ |
| 23 |
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Id$ |
| 25 |
|
| 26 |
+ 29 Apr 2016; Brian Evans <grknight@g.o> mysql-5.7.12.ebuild: |
| 27 |
+ dev-db/mysql: Force a download of boost-1.59 and use it in the build. Only a |
| 28 |
+ portion is actually used |
| 29 |
+ |
| 30 |
*mysql-5.7.12 (27 Apr 2016) |
| 31 |
|
| 32 |
27 Apr 2016; Brian Evans <grknight@g.o> +files/5.7.12-boost.cmake, |
| 33 |
|
| 34 |
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest |
| 35 |
index a07e6cc..5ee3cdf 100644 |
| 36 |
--- a/dev-db/mysql/Manifest |
| 37 |
+++ b/dev-db/mysql/Manifest |
| 38 |
@@ -1,6 +1,4 @@ |
| 39 |
------BEGIN PGP SIGNED MESSAGE----- |
| 40 |
-Hash: SHA256 |
| 41 |
- |
| 42 |
+DIST boost_1_59_0.tar.bz2 70389425 SHA256 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca SHA512 8139e1ae997a86974071c5714ad3307e3d8fd15ef702b81a953410dd4d424b932135f53a0ef4891d9b9b747a38e539e66d6a803388fe0cc98e5166be872d682a WHIRLPOOL ab26f6b770c32320e71806d7f7856b3841917dcc59e0c5ee588fc77d77f11855dda66bfb808dbe0f3f89859b958211439c271401a5b1ad2ea98aa5d377934510 |
| 43 |
DIST mysql-4.0.27.tar.gz 11152643 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f SHA512 188283133e99e1c0b52ac8650aff325d7c9762fbad526c2c67b26dd614f2a86afb247a3f55ff071be1d44cd13060b9d7cca08ba1d758a04d2369381fa104454e WHIRLPOOL d3964468635eae0caf7fc8fb7b3576da12d49264bd9b797bb2191da8c6b91ca46321fb090e994df2b93b43f50686dcc4f735bdff03b49a3176fa746d5c4a60ab |
| 44 |
DIST mysql-4.1.22.tar.gz 17761101 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 SHA512 9de1c2b27cf428a10f67a6217fc2783b638beb6345e2127a4163ceb286073886d223de861c40be0ab36ea78ec5f33ccd5ee457d1e35e67b081d629118b68d390 WHIRLPOOL b40ca2e0d07fc0bd504e57b7eb005d36cf842bb668e93722c723bcc5a797dc9b456ee8971ea99bfc2b9119a2e19ee599f8441eb4601709eb4238196a27319257 |
| 45 |
DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde153957579e3349e3ec780b89d741fc84 SHA512 2e3b4ac221c1c1c11618dc79067a7feff680380fcea435813287b02cb0dff45fb5a32a4393c53cf13165f6efc99dbf347a9388ad364cfdf2e392760a310aa5a9 WHIRLPOOL 3e167e4ff4c56095fbdee55b7e619c9b7ad2120eb72c9a58fe77a023ab6e7498c74e2053876e61687d7812f9ff7022303728ddda49732e7569035684263d2517 |
| 46 |
@@ -18,22 +16,3 @@ DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a |
| 47 |
DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd |
| 48 |
DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962 |
| 49 |
DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf |
| 50 |
------BEGIN PGP SIGNATURE----- |
| 51 |
-Version: GnuPG v2.1 |
| 52 |
- |
| 53 |
-iQJ8BAEBCABmBQJXIQsDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w |
| 54 |
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE |
| 55 |
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2gVUP/3IBPwZuxtL7bx6SFzWzYePU |
| 56 |
-B6Lfu6OmLOzRAQohiQtQuAkw98eWf1abv2t2aT4qcagakgjmJAKKH+UIcypwQh9f |
| 57 |
-0QMasfkjeBSw0ioQT0BlnbP2Jb1P5k6he+wOkftyOTKGGA2m6sqwPM7QUyiXglG9 |
| 58 |
-lTdbatyANEwosiG6Q9i6fOcDb1JeT6y0kFvPErN50i7xxzSwd/Cj3imTw+3XqwDc |
| 59 |
-65S/CcJYzswB+xovaLJGmELOkFre+gHCKx1dClkBhHF6SbA1kIk1yeMKRfp82czk |
| 60 |
-173epqJt6PS+tIOajCusrQ7wFlLPswcmum7rhYRMiEeDoyHl8p8ZusLCp7WfKuHQ |
| 61 |
-ITFFyphfcrdubloXynUXJ0dB4PWhSiWY8IQgVEc1nCRCr5ni7kqrUl0f6u0IMHEg |
| 62 |
-VVa0MXt0bFSkEhtS2rkUEHQVIS4k6PuO53RIZzjp1+lOU+zInnV6qZ90wK4n9Y6f |
| 63 |
-SxRgnjUeZdV8+yx9ZUpkkFYkEttnBgq7eFmiMZsvEpJtcfCRtZFT0QZl+KxvdvEl |
| 64 |
-+Ni/C3bOPzARoNNDj/S8yeEwiof/dvNk7JvJ+wIuYY7XsU1mOibbVvQvPQrO8ghD |
| 65 |
-4U+jaf0dakZU+Qq9+fzMWiAyQ2UjdAGq8Cvo3BjDyCgXV7zefav7dELl+trZgoOE |
| 66 |
-sgbCr8Zz+Oco2VQcMZvl |
| 67 |
-=EyUG |
| 68 |
------END PGP SIGNATURE----- |
| 69 |
|
| 70 |
diff --git a/dev-db/mysql/mysql-5.7.12.ebuild b/dev-db/mysql/mysql-5.7.12.ebuild |
| 71 |
index 73543de..9d6adf2 100644 |
| 72 |
--- a/dev-db/mysql/mysql-5.7.12.ebuild |
| 73 |
+++ b/dev-db/mysql/mysql-5.7.12.ebuild |
| 74 |
@@ -10,6 +10,8 @@ MY_PV="${MY_PV//_/-}" |
| 75 |
SUBSLOT="20" |
| 76 |
|
| 77 |
inherit mysql-multilib-r1 |
| 78 |
+SRC_URI+="mirror://sourceforge/boost/boost_1_59_0.tar.bz2" |
| 79 |
+ |
| 80 |
# only to make repoman happy. it is really set in the eclass |
| 81 |
IUSE="$IUSE" |
| 82 |
|
| 83 |
@@ -20,7 +22,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 |
| 84 |
EPATCH_EXCLUDE='' |
| 85 |
|
| 86 |
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
| 87 |
- >=dev-libs/boost-1.60:= |
| 88 |
>=app-arch/lz4-0_p131:=" |
| 89 |
RDEPEND="${RDEPEND}" |
| 90 |
|
| 91 |
@@ -46,16 +47,13 @@ src_prepare() { |
| 92 |
sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ |
| 93 |
"${S}/cmake/ssl.cmake" || die |
| 94 |
fi |
| 95 |
- # Oracle's boost detection does not fit well with Gentoo |
| 96 |
- # It includes download and build on the fly and hard depending on a single version |
| 97 |
- # Replace it with a stripped down version |
| 98 |
- cp "${FILESDIR}/5.7.12-boost.cmake" "${S}/cmake/boost.cmake" || die |
| 99 |
} |
| 100 |
|
| 101 |
src_configure() { |
| 102 |
local MYSQL_CMAKE_NATIVE_DEFINES=( |
| 103 |
-DWITH_LZ4=system |
| 104 |
-DWITH_NUMA=OFF |
| 105 |
+ -DWITH_BOOST="${WORKDIR}/boost_1_59_0" |
| 106 |
) |
| 107 |
mysql-multilib-r1_src_configure |
| 108 |
} |
Archives