grknight 14/08/20 18:52:50 Modified: myodbc-5.2.7.ebuild ChangeLog Log: Fix build failures on >=dev-db/mariadb-10.0 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)
Revision Changes Path 1.2 dev-db/myodbc/myodbc-5.2.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/myodbc-5.2.7.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/myodbc-5.2.7.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/myodbc-5.2.7.ebuild?r1=1.1&r2=1.2 Index: myodbc-5.2.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.7.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- myodbc-5.2.7.ebuild 29 Jul 2014 03:35:31 -0000 1.1 +++ myodbc-5.2.7.ebuild 20 Aug 2014 18:52:50 -0000 1.2 @@ -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/dev-db/myodbc/myodbc-5.2.7.ebuild,v 1.1 2014/07/29 03:35:31 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.7.ebuild,v 1.2 2014/08/20 18:52:50 grknight Exp $ EAPI=5 inherit cmake-utils eutils flag-o-matic versionator @@ -38,7 +38,9 @@ echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt" # Patch document path so it doesn't install files to /usr - epatch "${FILESDIR}/cmake-doc-path.patch" + epatch "${FILESDIR}/cmake-doc-path.patch" \ + "${FILESDIR}/${PV}-cxxlinkage.patch" \ + "${FILESDIR}/${PV}-mariadb-dynamic-array.patch" } src_configure() { @@ -49,6 +51,7 @@ -DWITH_UNIXODBC=1 -DRPM_BUILD=1 -DMYSQLCLIENT_LIB_NAME="libmysqlclient_r.so" + -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${P} ) cmake-utils_src_configure 1.37 dev-db/myodbc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/ChangeLog?rev=1.37&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/ChangeLog?rev=1.37&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/ChangeLog?r1=1.36&r2=1.37 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- ChangeLog 29 Jul 2014 03:35:31 -0000 1.36 +++ ChangeLog 20 Aug 2014 18:52:50 -0000 1.37 @@ -1,6 +1,10 @@ # ChangeLog for dev-db/myodbc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.36 2014/07/29 03:35:31 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.37 2014/08/20 18:52:50 grknight Exp $ + + 20 Aug 2014; <[email protected]> +files/5.2.7-cxxlinkage.patch, + +files/5.2.7-mariadb-dynamic-array.patch, myodbc-5.2.7.ebuild: + Fix build failures on >=dev-db/mariadb-10.0 *myodbc-5.2.7 (29 Jul 2014)
