1 |
commit: ef69414fc66c12f3a0cf95c978c851a850a3fe12 |
2 |
Author: Brian Evans <grknight <AT> lavabit <DOT> com> |
3 |
AuthorDate: Wed Feb 27 17:38:59 2013 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 27 17:38:59 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ef69414f |
7 |
|
8 |
Bump to 5.6.10 and fix 5.6 linkage failures |
9 |
|
10 |
--- |
11 |
dev-db/mysql/Manifest | 1 + |
12 |
dev-db/mysql/mysql-5.6.10.ebuild | 119 ++++++++++++++++++++++++++++++++++++++ |
13 |
eclass/mysql-cmake.eclass | 6 ++- |
14 |
3 files changed, 125 insertions(+), 1 deletions(-) |
15 |
|
16 |
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest |
17 |
index 87a0ac8..6671950 100644 |
18 |
--- a/dev-db/mysql/Manifest |
19 |
+++ b/dev-db/mysql/Manifest |
20 |
@@ -2,6 +2,7 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256 43853814775158aa1650f483530a7dde1539575 |
21 |
DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907 SHA512 01b7ff0a08362249e04a9a66cf0f255cb517f22d336201ba4ae8759cfc8047cb3dcaff75821796c01f87b35a7e8f5533957152cc7ae905cdf65f40239634e4f0 WHIRLPOOL 384cb0ef805ac70646f834ed7140ec1dd9ee4810692ba8e671eb7f5006ce2f97a401097224ce78316c371860639322164505e9099c1233d1816fa7bbc4fd354b |
22 |
DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d |
23 |
DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773 |
24 |
+DIST mysql-5.6.10.tar.gz 35174149 SHA256 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 SHA512 0dcaadccf52e51c33995232740ab62cde06fa5deb964421064642908dae7ea46e605e7620508b8b043e287f12cd0caf647d77477eddf9d61d93c896bff83afbd WHIRLPOOL f3f88d9f66eee2f135ebea8b1daa48ddd30f870cca400f7d70bfceb9cadc1ade44ae8d0f61c3deb12ce489a0c6be094155e4313268d9c45adb3844f748aa7cb4 |
25 |
DIST mysql-5.6.7-rc.tar.gz 34316534 SHA256 cc24b2ad3f5d7df4849bb9c5c2c32c1ec329ff87a44db08737d336b964359600 SHA512 86cb6298be320e61974626f7708dbab75478b98fc1c9f5bb81a241ad7bd70a249692f2254f41b9e96804380ff78b21ccd006e7a861532a97e558816e46ec6b8d WHIRLPOOL 26d2edd331388b4fa08b8384a4c292cdec927216054ece6708227d11d9fe68c55d50e7a828c3395c25997a967ca5acbabac5dbd47ecc6e61c24170fafbc3af79 |
26 |
DIST mysql-5.6.9-rc.tar.gz 35444739 SHA256 f815b9a98ae2e65f9efed7ea24d489aa182917d9504a8ff041f9cb1fb02f48ff SHA512 2c615d96867bab78751d54ef163001cbcfa0676ac4a8c34b8f5c93cf256b94b4beb60fc2d8ded8d4272bd61a53119328a6e1c3db61ea5fbe4de4409ff804ff75 WHIRLPOOL 0577bc5297d034202ab0d3b08d24c979fdb62e078e8b99bded67b1f4f5e144ed0e1d602c6b03cc2e0941ad79fd179dcbc0e9bad0b7dd9a57356403a90776f15f |
27 |
DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213 |
28 |
|
29 |
diff --git a/dev-db/mysql/mysql-5.6.10.ebuild b/dev-db/mysql/mysql-5.6.10.ebuild |
30 |
new file mode 100644 |
31 |
index 0000000..496dc33 |
32 |
--- /dev/null |
33 |
+++ b/dev-db/mysql/mysql-5.6.10.ebuild |
34 |
@@ -0,0 +1,119 @@ |
35 |
+# Copyright 1999-2013 Gentoo Foundation |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $ |
38 |
+ |
39 |
+EAPI="4" |
40 |
+ |
41 |
+MY_EXTRAS_VER="live" |
42 |
+MY_PV="${PV//_alpha_pre/-m}" |
43 |
+MY_PV="${MY_PV//_/-}" |
44 |
+ |
45 |
+# Build type |
46 |
+BUILD="cmake" |
47 |
+ |
48 |
+inherit toolchain-funcs mysql-v2 |
49 |
+# only to make repoman happy. it is really set in the eclass |
50 |
+IUSE="$IUSE" |
51 |
+ |
52 |
+# Define the mysql-extras source |
53 |
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" |
54 |
+ |
55 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
56 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" |
57 |
+ |
58 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
59 |
+EPATCH_EXCLUDE='' |
60 |
+ |
61 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
62 |
+RDEPEND="${RDEPEND}" |
63 |
+ |
64 |
+# Please do not add a naive src_unpack to this ebuild |
65 |
+# If you want to add a single patch, copy the ebuild to an overlay |
66 |
+# and create your own mysql-extras tarball, looking at 000_index.txt |
67 |
+ |
68 |
+# Official test instructions: |
69 |
+# USE='berkdb -cluster embedded extraengine perl ssl community' \ |
70 |
+# FEATURES='test userpriv -usersandbox' \ |
71 |
+# ebuild mysql-X.X.XX.ebuild \ |
72 |
+# digest clean package |
73 |
+src_test() { |
74 |
+ |
75 |
+ local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test" |
76 |
+ local retstatus_unit |
77 |
+ local retstatus_tests |
78 |
+ |
79 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
80 |
+ # localhost. Also causes weird failures. |
81 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
82 |
+ |
83 |
+ if ! use "minimal" ; then |
84 |
+ |
85 |
+ if [[ $UID -eq 0 ]]; then |
86 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
87 |
+ fi |
88 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
89 |
+ |
90 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
91 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
92 |
+ |
93 |
+ # Run CTest (test-units) |
94 |
+ cmake-utils_src_test |
95 |
+ retstatus_unit=$? |
96 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
97 |
+ |
98 |
+ # Ensure that parallel runs don't die |
99 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
100 |
+ |
101 |
+ # create directories because mysqladmin might right out of order |
102 |
+ mkdir -p "${S}"/mysql-test/var-tests{,/log} |
103 |
+ |
104 |
+ # These are failing in MySQL 5.5 for now and are believed to be |
105 |
+ # false positives: |
106 |
+ # |
107 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
108 |
+ # main.mysqld--help-notwin |
109 |
+ # fails due to USE=-latin1 / utf8 default |
110 |
+ # |
111 |
+ # main.mysql_client_test: |
112 |
+ # segfaults at random under Portage only, suspect resource limits. |
113 |
+ # |
114 |
+ # sys_vars.plugin_dir_basic |
115 |
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin |
116 |
+ # instead of MYSQL_LIBDIR/plugin |
117 |
+ # |
118 |
+ # main.flush_read_lock_kill |
119 |
+ # fails because of unknown system variable 'DEBUG_SYNC' |
120 |
+ for t in main.mysql_client_test \ |
121 |
+ binlog.binlog_statement_insert_delayed main.information_schema \ |
122 |
+ main.mysqld--help-notwin; do |
123 |
+ mysql_disable_test "$t" "False positives in Gentoo" |
124 |
+ done |
125 |
+ |
126 |
+ # Run mysql tests |
127 |
+ pushd "${TESTDIR}" |
128 |
+ |
129 |
+ # run mysql-test tests |
130 |
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" |
131 |
+ retstatus_tests=$? |
132 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
133 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
134 |
+ |
135 |
+ popd |
136 |
+ |
137 |
+ # Cleanup is important for these testcases. |
138 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
139 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
140 |
+ |
141 |
+ failures="" |
142 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
143 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
144 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
145 |
+ |
146 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
147 |
+ einfo "Tests successfully completed" |
148 |
+ |
149 |
+ else |
150 |
+ |
151 |
+ einfo "Skipping server tests due to minimal build." |
152 |
+ fi |
153 |
+} |
154 |
|
155 |
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass |
156 |
index ffbcbd2..02326f2 100644 |
157 |
--- a/eclass/mysql-cmake.eclass |
158 |
+++ b/eclass/mysql-cmake.eclass |
159 |
@@ -221,6 +221,7 @@ mysql-cmake_src_prepare() { |
160 |
[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" |
161 |
|
162 |
rm -f "scripts/mysqlbug" |
163 |
+ epatch_user |
164 |
} |
165 |
|
166 |
# @FUNCTION: mysql-cmake_src_configure |
167 |
@@ -275,7 +276,10 @@ mysql-cmake_src_configure() { |
168 |
|
169 |
CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" |
170 |
CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" |
171 |
- CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" |
172 |
+ # Causes linkage failures. Upstream bug #59607 removes it |
173 |
+ if ! mysql_version_is_at_least "5.6" ; then |
174 |
+ CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" |
175 |
+ fi |
176 |
export CXXFLAGS |
177 |
|
178 |
# bug #283926, with GCC4.4, this is required to get correct behavior. |