| 1 |
grknight 14/06/20 00:03:33 |
| 2 |
|
| 3 |
Modified: ChangeLog mysql-cmake.eclass mysql-v2.eclass |
| 4 |
Log: |
| 5 |
Sync eclasses with mysql overlay |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1295 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1295&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1295&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1294&r2=1.1295 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1294 |
| 18 |
retrieving revision 1.1295 |
| 19 |
diff -u -r1.1294 -r1.1295 |
| 20 |
--- ChangeLog 19 Jun 2014 15:10:55 -0000 1.1294 |
| 21 |
+++ ChangeLog 20 Jun 2014 00:03:33 -0000 1.1295 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1294 2014/06/19 15:10:55 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1295 2014/06/20 00:03:33 grknight Exp $ |
| 27 |
+ |
| 28 |
+ 19 Jun 2014; Brian Evans <grknight@g.o> mysql-v2.eclass, mysql-cmake.eclass: |
| 29 |
+ Sync with mysql overlay. |
| 30 |
|
| 31 |
19 Jun 2014; Michał Górny <mgorny@g.o> python-utils-r1.eclass: |
| 32 |
python_fix_shebang: properly unset local variables in loop iterations. |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.21 eclass/mysql-cmake.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.21&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.21&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.20&r2=1.21 |
| 41 |
|
| 42 |
Index: mysql-cmake.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v |
| 45 |
retrieving revision 1.20 |
| 46 |
retrieving revision 1.21 |
| 47 |
diff -u -r1.20 -r1.21 |
| 48 |
--- mysql-cmake.eclass 15 May 2014 03:18:47 -0000 1.20 |
| 49 |
+++ mysql-cmake.eclass 20 Jun 2014 00:03:33 -0000 1.21 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2014 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.20 2014/05/15 03:18:47 grknight Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.21 2014/06/20 00:03:33 grknight Exp $ |
| 55 |
|
| 56 |
# @ECLASS: mysql-cmake.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -251,7 +251,7 @@ |
| 59 |
|
| 60 |
rm -f "scripts/mysqlbug" |
| 61 |
if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33" ); then |
| 62 |
- echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" |
| 63 |
+ echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die |
| 64 |
fi |
| 65 |
|
| 66 |
if use tcmalloc; then |
| 67 |
@@ -301,7 +301,6 @@ |
| 68 |
-DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql |
| 69 |
-DWITH_COMMENT="Gentoo Linux ${PF}" |
| 70 |
$(cmake-utils_use_with test UNIT_TESTS) |
| 71 |
- -DWITH_READLINE=0 |
| 72 |
-DWITH_LIBEDIT=0 |
| 73 |
-DWITH_ZLIB=system |
| 74 |
-DWITHOUT_LIBWRAP=1 |
| 75 |
@@ -312,14 +311,16 @@ |
| 76 |
|
| 77 |
if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then |
| 78 |
mycmakeargs+=( -DWITH_EDITLINE=system ) |
| 79 |
+ else |
| 80 |
+ mycmakeargs+=( |
| 81 |
+ -DWITH_READLINE=$(usex bindist 1 0) |
| 82 |
+ -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) |
| 83 |
+ $(usex bindist -DHAVE_BFD_H=0 '') |
| 84 |
+ ) |
| 85 |
fi |
| 86 |
|
| 87 |
- # Bug 412851 |
| 88 |
- # MariaDB requires NOT_FOR_DISTRIBUTION set to compile with GPLv3 readline linked |
| 89 |
- # Adds a warning about redistribution to configure |
| 90 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 91 |
mycmakeargs+=( |
| 92 |
- -DNOT_FOR_DISTRIBUTION=1 |
| 93 |
-DWITH_JEMALLOC=$(usex jemalloc system) |
| 94 |
) |
| 95 |
mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system ) |
| 96 |
@@ -409,11 +410,11 @@ |
| 97 |
mycnf_src="my.cnf-${mysql_mycnf_version}" |
| 98 |
sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ |
| 99 |
"${FILESDIR}/${mycnf_src}" \ |
| 100 |
- > "${TMPDIR}/my.cnf.ok" |
| 101 |
+ > "${TMPDIR}/my.cnf.ok" || die |
| 102 |
if use latin1 ; then |
| 103 |
sed -i \ |
| 104 |
-e "/character-set/s|utf8|latin1|g" \ |
| 105 |
- "${TMPDIR}/my.cnf.ok" |
| 106 |
+ "${TMPDIR}/my.cnf.ok" || die |
| 107 |
fi |
| 108 |
eprefixify "${TMPDIR}/my.cnf.ok" |
| 109 |
newins "${TMPDIR}/my.cnf.ok" my.cnf |
| 110 |
@@ -458,4 +459,15 @@ |
| 111 |
#Remove mytop if perl is not selected |
| 112 |
[[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \ |
| 113 |
&& rm -f "${ED}/usr/bin/mytop" |
| 114 |
+ |
| 115 |
+ # Percona has decided to rename libmysqlclient to libperconaserverclient |
| 116 |
+ # Use a symlink to preserve linkages for those who don't use mysql_config |
| 117 |
+ if [[ ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.5.36" ; then |
| 118 |
+ dosym libperconaserverclient.so /usr/$(get_libdir)/libmysqlclient.so |
| 119 |
+ dosym libperconaserverclient.so /usr/$(get_libdir)/libmysqlclient_r.so |
| 120 |
+ if use static-libs ; then |
| 121 |
+ dosym libperconaserverclient.a /usr/$(get_libdir)/libmysqlclient.a |
| 122 |
+ dosym libperconaserverclient.a /usr/$(get_libdir)/libmysqlclient_r.a |
| 123 |
+ fi |
| 124 |
+ fi |
| 125 |
} |
| 126 |
|
| 127 |
|
| 128 |
|
| 129 |
1.31 eclass/mysql-v2.eclass |
| 130 |
|
| 131 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.31&view=markup |
| 132 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.31&content-type=text/plain |
| 133 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.30&r2=1.31 |
| 134 |
|
| 135 |
Index: mysql-v2.eclass |
| 136 |
=================================================================== |
| 137 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v |
| 138 |
retrieving revision 1.30 |
| 139 |
retrieving revision 1.31 |
| 140 |
diff -u -r1.30 -r1.31 |
| 141 |
--- mysql-v2.eclass 4 Jun 2014 01:17:11 -0000 1.30 |
| 142 |
+++ mysql-v2.eclass 20 Jun 2014 00:03:33 -0000 1.31 |
| 143 |
@@ -1,6 +1,6 @@ |
| 144 |
# Copyright 1999-2014 Gentoo Foundation |
| 145 |
# Distributed under the terms of the GNU General Public License v2 |
| 146 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.30 2014/06/04 01:17:11 grknight Exp $ |
| 147 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.31 2014/06/20 00:03:33 grknight Exp $ |
| 148 |
|
| 149 |
# @ECLASS: mysql-v2.eclass |
| 150 |
# @MAINTAINER: |
| 151 |
@@ -209,6 +209,11 @@ |
| 152 |
# Common IUSE |
| 153 |
IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling" |
| 154 |
|
| 155 |
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ |
| 156 |
+ mysql_version_is_at_least "5.5" || mysql_check_version_range "5.5.37 to 5.6.11.99" ; then |
| 157 |
+ IUSE="bindist ${IUSE}" |
| 158 |
+fi |
| 159 |
+ |
| 160 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then |
| 161 |
mysql_check_version_range "5.1.38 to 5.3.99" && IUSE="${IUSE} libevent" |
| 162 |
mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" && \ |
| 163 |
@@ -258,7 +263,11 @@ |
| 164 |
if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then |
| 165 |
DEPEND="${DEPEND} dev-libs/libedit" |
| 166 |
else |
| 167 |
- DEPEND="${DEPEND} >=sys-libs/readline-4.1" |
| 168 |
+ if mysql_version_is_at_least "5.5" ; then |
| 169 |
+ DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1 )" |
| 170 |
+ else |
| 171 |
+ DEPEND="${DEPEND} >=sys-libs/readline-4.1" |
| 172 |
+ fi |
| 173 |
fi |
| 174 |
|
| 175 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
Archives