From 6d5db58628c43216250f1d67de7d9c91aef13847 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Mon, 26 Apr 2021 16:52:27 +0200 Subject: dev-db/myodbc: don't static link mysqlclient anymore Closes: https://bugs.gentoo.org/769299 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann --- dev-db/myodbc/myodbc-8.0.24-r1.ebuild | 129 ++++++++++++++++++++++++++++++++++ dev-db/myodbc/myodbc-8.0.24.ebuild | 122 -------------------------------- 2 files changed, 129 insertions(+), 122 deletions(-) create mode 100644 dev-db/myodbc/myodbc-8.0.24-r1.ebuild delete mode 100644 dev-db/myodbc/myodbc-8.0.24.ebuild (limited to 'dev-db/myodbc') diff --git a/dev-db/myodbc/myodbc-8.0.24-r1.ebuild b/dev-db/myodbc/myodbc-8.0.24-r1.ebuild new file mode 100644 index 000000000000..888d9f95fe16 --- /dev/null +++ b/dev-db/myodbc/myodbc-8.0.24-r1.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-multilib + +MAJOR="$(ver_cut 1-2)" +MY_PN="mysql-connector-odbc" +MY_P="${MY_PN}-${PV/_p/r}-src" + +DESCRIPTION="ODBC driver for MySQL" +HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/" +SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="${MAJOR}" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND=" + dev-db/unixODBC[${MULTILIB_USEDEP}] + >=dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" +S=${WORKDIR}/${MY_P} + +# Careful! +DRIVER_NAME="${PN}-${SLOT}" + +# Patch document path so it doesn't install files to /usr +PATCHES=( + "${FILESDIR}/${MAJOR}-cmake-doc-path.patch" + "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch" +) + +src_prepare() { + # Remove Tests + sed -i -e "s/ADD_SUBDIRECTORY(test)//" \ + "${S}/CMakeLists.txt" + + cmake-utils_src_prepare +} + +multilib_src_configure() { + CMAKE_BUILD_TYPE="RelWithDebInfo" + + mycmakeargs+=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG + -DMYSQLCLIENT_STATIC_LINKING=OFF + -DMYSQL_CXX_LINKAGE=YES + -DWITH_UNIXODBC=YES + -DWITH_DOCUMENTATION_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF} + -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}" + -DMYSQLCLIENT_NO_THREADS=ON + -DDISABLE_GUI=ON + # Don't build "libmysql_strings.so" and "libmysql_sys.so" which are only + # used internally + -DBUILD_SHARED_LIBS=OFF + # The NUMA and LIBWRAP options are not really used. + # They are just copied from the server code + -DWITH_NUMA=OFF + -DWITH_LIBWRAP=OFF + ) + + 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,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \ + >"${D}"/usr/share/${PN}-${SLOT}/${i} \ + <"${FILESDIR}"/${i}.m4 \ + || die "Failed to build $i" + done + + rm -rf "${ED}/usr/$(get_libdir)/${PN}-${MAJOR}/private" \ + || die "failed to remove bundled libs" + + 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}" +} diff --git a/dev-db/myodbc/myodbc-8.0.24.ebuild b/dev-db/myodbc/myodbc-8.0.24.ebuild deleted file mode 100644 index aca18615d239..000000000000 --- a/dev-db/myodbc/myodbc-8.0.24.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-multilib - -MAJOR="$(ver_cut 1-2)" -MY_PN="mysql-connector-odbc" -MY_P="${MY_PN}-${PV/_p/r}-src" - -DESCRIPTION="ODBC driver for MySQL" -HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/" -SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="${MAJOR}" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -# Broken when built dynamically against libmysqlclient.so -RDEPEND=" - dev-db/unixODBC[${MULTILIB_USEDEP}] - >=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -S=${WORKDIR}/${MY_P} - -# Careful! -DRIVER_NAME="${PN}-${SLOT}" - -# Patch document path so it doesn't install files to /usr -PATCHES=( - "${FILESDIR}/${MAJOR}-cmake-doc-path.patch" - "${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch" -) - -src_prepare() { - # Remove Tests - sed -i -e "s/ADD_SUBDIRECTORY(test)//" \ - "${S}/CMakeLists.txt" - - cmake-utils_src_prepare -} - -multilib_src_configure() { - mycmakeargs+=( - -DMYSQLCLIENT_STATIC_LINKING=1 - -DMYSQL_CXX_LINKAGE=1 - -DWITH_UNIXODBC=1 - -DWITH_DOCUMENTATION_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF} - -DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}" - -DMYSQLCLIENT_NO_THREADS=ON - -DDISABLE_GUI=ON - # The NUMA and LIBWRAP options are not really used. - # They are just copied from the server code - -DWITH_NUMA=OFF - -DWITH_LIBWRAP=OFF - ) - 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,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \ - >"${D}"/usr/share/${PN}-${SLOT}/${i} \ - <"${FILESDIR}"/${i}.m4 \ - || die "Failed to build $i" - done - - rm -rf "${ED}/usr/$(get_libdir)/${PN}-${MAJOR}/private" \ - || die "failed to remove bundled libs" - - 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}" -} -- cgit v1.2.3-65-gdbad