grknight 14/09/01 01:15:28 Modified: ChangeLog Added: myodbc-5.2.7-r1.ebuild Log: Revision bump to enable multilib (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)
Revision Changes Path 1.38 dev-db/myodbc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/ChangeLog?rev=1.38&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/ChangeLog?rev=1.38&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/ChangeLog?r1=1.37&r2=1.38 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- ChangeLog 20 Aug 2014 18:52:50 -0000 1.37 +++ ChangeLog 1 Sep 2014 01:15:27 -0000 1.38 @@ -1,6 +1,12 @@ # 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.37 2014/08/20 18:52:50 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.38 2014/09/01 01:15:27 grknight Exp $ + +*myodbc-5.2.7-r1 (01 Sep 2014) + + 01 Sep 2014; Brian Evans <[email protected]> + +files/5.2.7-r1-cxxlinkage.patch, +myodbc-5.2.7-r1.ebuild: + Revision bump to enable multilib 20 Aug 2014; <[email protected]> +files/5.2.7-cxxlinkage.patch, +files/5.2.7-mariadb-dynamic-array.patch, myodbc-5.2.7.ebuild: 1.1 dev-db/myodbc/myodbc-5.2.7-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/myodbc-5.2.7-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/myodbc/myodbc-5.2.7-r1.ebuild?rev=1.1&content-type=text/plain Index: myodbc-5.2.7-r1.ebuild =================================================================== # 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-r1.ebuild,v 1.1 2014/09/01 01:15:27 grknight Exp $ EAPI=5 inherit cmake-multilib eutils flag-o-matic versionator MAJOR="$(get_version_component_range 1-2 $PV)" MY_PN="mysql-connector-odbc" MY_P="${MY_PN}-${PV/_p/r}-src" DESCRIPTION="ODBC driver for MySQL" HOMEPAGE="http://www.mysql.com/products/myodbc/"; SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz" RESTRICT="primaryuri" LICENSE="GPL-2" SLOT="${MAJOR}" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" RDEPEND=" dev-db/unixODBC[${MULTILIB_USEDEP}] >=virtual/mysql-5.5[${MULTILIB_USEDEP}] abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) " DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} # Careful! DRIVER_NAME="${PN}-${SLOT}" src_prepare() { # Remove Tests sed -i -e "s/ADD_SUBDIRECTORY(test)//" \ "${S}/CMakeLists.txt" # Fix as-needed on the installer binary 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" \ "${FILESDIR}/${PVR}-cxxlinkage.patch" \ "${FILESDIR}/${PV}-mariadb-dynamic-array.patch" } multilib_src_configure() { # The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64" # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB mycmakeargs+=( -DMYSQL_CXX_LINKAGE=0 -DWITH_UNIXODBC=1 -DMYSQLCLIENT_LIB_NAME="libmysqlclient_r.so" -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF} -DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)" -DLIB_SUBDIR="$(get_libdir)" ) cmake-utils_src_configure } multilib_src_install_all() { debug-print-function ${FUNCNAME} "$@" dodir /usr/share/${PN}-${SLOT} for i in odbc.ini odbcinst.ini; do einfo "Building $i" sed \ -e "s,__PN__,${DRIVER_NAME},g" \ -e "s,__PF__,${MAJOR},g" \ -e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \ >"${D}"/usr/share/${PN}-${SLOT}/${i} \ <"${FILESDIR}"/${i}.m4 \ || die "Failed to build $i" done; mv "${D}/usr/bin/myodbc-installer" \ "${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary" } pkg_config() { [ "${ROOT}" != "/" ] && \ die 'Sorry, non-standard ROOT setting is not supported :-(' local msg='MySQL ODBC driver' local drivers=$(/usr/bin/odbcinst -q -d) if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then ebegin "Installing ${msg}" /usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini rc=$? eend $rc [ $rc -ne 0 ] && die else einfo "Skipping already installed ${msg}" fi local sources=$(/usr/bin/odbcinst -q -s) msg='sample MySQL ODBC DSN' if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then ebegin "Installing ${msg}" /usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini rc=$? eend $rc [ $rc -ne 0 ] && die else einfo "Skipping already installed ${msg}" fi } pkg_postinst() { elog "If this is a new install, please run the following command" elog "to configure the MySQL ODBC drivers and sources:" elog "emerge --config =${CATEGORY}/${PF}" elog "Please note that the driver name used to form the DSN now includes the SLOT." elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}" }
