grknight 14/06/20 00:03:33 Modified: ChangeLog mysql-cmake.eclass mysql-v2.eclass Log: Sync eclasses with mysql overlay
Revision Changes Path 1.1295 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1295&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1295&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1294&r2=1.1295 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1294 retrieving revision 1.1295 diff -u -r1.1294 -r1.1295 --- ChangeLog 19 Jun 2014 15:10:55 -0000 1.1294 +++ ChangeLog 20 Jun 2014 00:03:33 -0000 1.1295 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1294 2014/06/19 15:10:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1295 2014/06/20 00:03:33 grknight Exp $ + + 19 Jun 2014; Brian Evans <[email protected]> mysql-v2.eclass, mysql-cmake.eclass: + Sync with mysql overlay. 19 Jun 2014; Michał Górny <[email protected]> python-utils-r1.eclass: python_fix_shebang: properly unset local variables in loop iterations. 1.21 eclass/mysql-cmake.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.21&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.21&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.20&r2=1.21 Index: mysql-cmake.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mysql-cmake.eclass 15 May 2014 03:18:47 -0000 1.20 +++ mysql-cmake.eclass 20 Jun 2014 00:03:33 -0000 1.21 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.20 2014/05/15 03:18:47 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.21 2014/06/20 00:03:33 grknight Exp $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -251,7 +251,7 @@ rm -f "scripts/mysqlbug" if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.5.33" ); then - echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" + echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die fi if use tcmalloc; then @@ -301,7 +301,6 @@ -DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql -DWITH_COMMENT="Gentoo Linux ${PF}" $(cmake-utils_use_with test UNIT_TESTS) - -DWITH_READLINE=0 -DWITH_LIBEDIT=0 -DWITH_ZLIB=system -DWITHOUT_LIBWRAP=1 @@ -312,14 +311,16 @@ if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then mycmakeargs+=( -DWITH_EDITLINE=system ) + else + mycmakeargs+=( + -DWITH_READLINE=$(usex bindist 1 0) + -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1) + $(usex bindist -DHAVE_BFD_H=0 '') + ) fi - # Bug 412851 - # MariaDB requires NOT_FOR_DISTRIBUTION set to compile with GPLv3 readline linked - # Adds a warning about redistribution to configure if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then mycmakeargs+=( - -DNOT_FOR_DISTRIBUTION=1 -DWITH_JEMALLOC=$(usex jemalloc system) ) mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system ) @@ -409,11 +410,11 @@ mycnf_src="my.cnf-${mysql_mycnf_version}" sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ "${FILESDIR}/${mycnf_src}" \ - > "${TMPDIR}/my.cnf.ok" + > "${TMPDIR}/my.cnf.ok" || die if use latin1 ; then sed -i \ -e "/character-set/s|utf8|latin1|g" \ - "${TMPDIR}/my.cnf.ok" + "${TMPDIR}/my.cnf.ok" || die fi eprefixify "${TMPDIR}/my.cnf.ok" newins "${TMPDIR}/my.cnf.ok" my.cnf @@ -458,4 +459,15 @@ #Remove mytop if perl is not selected [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \ && rm -f "${ED}/usr/bin/mytop" + + # Percona has decided to rename libmysqlclient to libperconaserverclient + # Use a symlink to preserve linkages for those who don't use mysql_config + if [[ ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.5.36" ; then + dosym libperconaserverclient.so /usr/$(get_libdir)/libmysqlclient.so + dosym libperconaserverclient.so /usr/$(get_libdir)/libmysqlclient_r.so + if use static-libs ; then + dosym libperconaserverclient.a /usr/$(get_libdir)/libmysqlclient.a + dosym libperconaserverclient.a /usr/$(get_libdir)/libmysqlclient_r.a + fi + fi } 1.31 eclass/mysql-v2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.31&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.31&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.30&r2=1.31 Index: mysql-v2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- mysql-v2.eclass 4 Jun 2014 01:17:11 -0000 1.30 +++ mysql-v2.eclass 20 Jun 2014 00:03:33 -0000 1.31 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.30 2014/06/04 01:17:11 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.31 2014/06/20 00:03:33 grknight Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -209,6 +209,11 @@ # Common IUSE IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling" +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ + mysql_version_is_at_least "5.5" || mysql_check_version_range "5.5.37 to 5.6.11.99" ; then + IUSE="bindist ${IUSE}" +fi + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then mysql_check_version_range "5.1.38 to 5.3.99" && IUSE="${IUSE} libevent" mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" && \ @@ -258,7 +263,11 @@ if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then DEPEND="${DEPEND} dev-libs/libedit" else - DEPEND="${DEPEND} >=sys-libs/readline-4.1" + if mysql_version_is_at_least "5.5" ; then + DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1 )" + else + DEPEND="${DEPEND} >=sys-libs/readline-4.1" + fi fi if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
