From 93dc56e0b40fe411ad82b3990f85bd5adf562dad Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Thu, 22 Aug 2019 21:38:53 +0200 Subject: dev-db/mysql-connector-c: rev bump - Always install {lz4,zlib}_decompress - Avoid file collisions Closes: https://bugs.gentoo.org/692580 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann --- ...-8.0.17-always-build-decompress-utilities.patch | 22 +++++ .../mysql-connector-c-8.0.17-r1.ebuild | 98 ------------------ .../mysql-connector-c-8.0.17-r2.ebuild | 109 +++++++++++++++++++++ 3 files changed, 131 insertions(+), 98 deletions(-) create mode 100644 dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch delete mode 100644 dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild create mode 100644 dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild (limited to 'dev-db/mysql-connector-c') diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch new file mode 100644 index 000000000000..927662705aa3 --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch @@ -0,0 +1,22 @@ +--- a/utilities/CMakeLists.txt ++++ b/utilities/CMakeLists.txt +@@ -101,15 +101,11 @@ MYSQL_ADD_EXECUTABLE(perror perror.cc) + ADD_DEPENDENCIES(perror GenError) + TARGET_LINK_LIBRARIES(perror mysys) + +-IF (BUILD_BUNDLED_LZ4) +- MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) +- TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys) +-ENDIF() ++MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc) ++TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys) + +-IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB) +- MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) +- TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) +-ENDIF() ++MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc) ++TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys) + + IF(WITH_INNOBASE_STORAGE_ENGINE) + diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild deleted file mode 100644 index c99bb77dd8a1..000000000000 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-multilib - -# wrap the config script -MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) - -DESCRIPTION="C client library for MariaDB/MySQL" -HOMEPAGE="https://dev.mysql.com/downloads/" -LICENSE="GPL-2" - -SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -SLOT="0/21" -IUSE="ldap libressl static-libs" - -RDEPEND=" - sys-libs/zlib:=[${MULTILIB_USEDEP}] - ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - " -DEPEND="${RDEPEND}" - -DOCS=( README ) - -S="${WORKDIR}/mysql-${PV}" - -PATCHES=( "${FILESDIR}"/${PN}-8.0.17-libressl.patch ) - -src_prepare() { - sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die - - # All these are for the server only. - # Disable rpm call which would trigger sandbox, #692368 - sed -i \ - -e '/MYSQL_CHECK_LIBEVENT/d' \ - -e '/MYSQL_CHECK_RAPIDJSON/d' \ - -e '/MYSQL_CHECK_ICU/d' \ - -e '/MYSQL_CHECK_RE2/d' \ - -e '/MYSQL_CHECK_LZ4/d' \ - -e '/MYSQL_CHECK_EDITLINE/d' \ - -e '/MYSQL_CHECK_CURL/d' \ - -e '/ADD_SUBDIRECTORY(man)/d' \ - -e '/ADD_SUBDIRECTORY(share)/d' \ - -e '/INCLUDE(cmake\/boost/d' \ - -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \ - CMakeLists.txt || die - - # Skip building clients - echo > client/CMakeLists.txt || die - - # Forcefully disable auth plugin - if ! use ldap ; then - sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die - echo > libmysql/authentication_ldap/CMakeLists.txt || die - fi - - cmake-utils_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DINSTALL_LAYOUT=RPM - -DINSTALL_LIBDIR=$(get_libdir) - -DWITH_DEFAULT_COMPILER_OPTIONS=OFF - -DWITH_DEFAULT_FEATURE_SET=OFF - -DENABLED_LOCAL_INFILE=ON - -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" - -DWITH_ZLIB=system - -DWITH_SSL=system - -DWITH_NUMA=OFF - -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient - -DSHARED_LIB_PATCH_VERSION="0" - -DCMAKE_POSITION_INDEPENDENT_CODE=ON - -DWITHOUT_SERVER=ON - ) - cmake-utils_src_configure -} - -multilib_src_install() { - cmake-utils_src_install -} - -multilib_src_install_all() { - doman \ - man/my_print_defaults.1 \ - man/perror.1 \ - man/zlib_decompress.1 - - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi -} diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild new file mode 100644 index 000000000000..3eb18955b0bf --- /dev/null +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-multilib + +# wrap the config script +MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) + +DESCRIPTION="C client library for MariaDB/MySQL" +HOMEPAGE="https://dev.mysql.com/downloads/" +LICENSE="GPL-2" + +SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +SLOT="0/21" +IUSE="ldap libressl static-libs" + +RDEPEND=" + >=app-arch/lz4-0_p131:= + sys-libs/zlib:=[${MULTILIB_USEDEP}] + ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + " +DEPEND="${RDEPEND}" + +# Avoid file collisions, #692580 +RDEPEND+=" ! client/CMakeLists.txt || die + + # Forcefully disable auth plugin + if ! use ldap ; then + sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die + echo > libmysql/authentication_ldap/CMakeLists.txt || die + fi + + cmake-utils_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DINSTALL_LAYOUT=RPM + -DINSTALL_LIBDIR=$(get_libdir) + -DWITH_DEFAULT_COMPILER_OPTIONS=OFF + -DWITH_DEFAULT_FEATURE_SET=OFF + -DENABLED_LOCAL_INFILE=ON + -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" + -DWITH_ZLIB=system + -DWITH_SSL=system + -DWITH_NUMA=OFF + -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient + -DSHARED_LIB_PATCH_VERSION="0" + -DCMAKE_POSITION_INDEPENDENT_CODE=ON + -DWITHOUT_SERVER=ON + ) + cmake-utils_src_configure +} + +multilib_src_install() { + cmake-utils_src_install +} + +multilib_src_install_all() { + doman \ + man/my_print_defaults.1 \ + man/perror.1 \ + man/zlib_decompress.1 + + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +} -- cgit v1.2.3-65-gdbad