diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
| commit | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch) | |
| tree | 326613a08f25851c388715e205576a2e7d25dc4f /dev-db/mysql-connector-c | |
| parent | b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff) | |
gentoo resync : 18.08.2019
Diffstat (limited to 'dev-db/mysql-connector-c')
| -rw-r--r-- | dev-db/mysql-connector-c/Manifest | 4 | ||||
| -rw-r--r-- | dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild | 2 | ||||
| -rw-r--r-- | dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild | 17 |
3 files changed, 12 insertions, 11 deletions
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest index bd604f775e49..bcad2b4ef3f3 100644 --- a/dev-db/mysql-connector-c/Manifest +++ b/dev-db/mysql-connector-c/Manifest @@ -5,6 +5,6 @@ AUX mysql-connector-c-8.0.17-libressl.patch 10106 BLAKE2B 5ed9b5f77f35c5079ac13d AUX mysql_com.patch 1787 BLAKE2B 4fbd40325f400586926072927b3f07231d577f18c1e30951c34c36ded9b9e42b7c3dc47ca51df974265c28b40116e30274d8a73d6a843e5d9d0074430bc17b08 SHA512 340365b05d72045af0ef12fd5c260a796be547d9abb97a6ef3d6aaf30aecf29368c1dfa28f1284da544a81656f0436f11ada2f8c5cb481540d1f1c90dd354b49 DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B f9f46e5fdc3e9869b203626bc09edfbcdbabcd68eba43f9c6a33b9a52cffb3a32f39704c6d22a66899aac16fa2efb271c5dc7af7522768b45542ac8dc615cd8a SHA512 a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1 SHA512 271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6 -EBUILD mysql-connector-c-6.1.11-r2.ebuild 2285 BLAKE2B f739235634fd28fe7a7209aaba18cfaf0e8ae3b69bec6b92af86001cb6fb4d942631278e175f693f20621e839bca9d9f0e636f0c5344b477239603c49a96d438 SHA512 edd57fc96a15a4b1d0098da71c3e2a7de6d6050ee82d0ad80f4089f9a4ebc09815bafd314b7a7dbf10748ce9f3a66a30eb5d835a91d8d19ebfc2779e6716a2b3 -EBUILD mysql-connector-c-8.0.17-r1.ebuild 2369 BLAKE2B 213aaf2d9b0c17e8226bdd9b38f25a2e12fbcc46d723154bd9fcb45efa5e2898c19ebb015372818accc032bfd355cb38e457cdd3ce026ebbbb7b0608f4cf13a4 SHA512 ab3f47b11fa930457e666d6854df921b8ed7114fc0f100600a3badad18009cc32b34a80ed95b052288bf79c7ac6b57c65cab0c786eb1c8efe3e54ac639aa0fb5 +EBUILD mysql-connector-c-6.1.11-r2.ebuild 2289 BLAKE2B edce26b9fea987ad0d3ba93388303f62dfe004779989c6e21ac154275cd9b7e0b3f0749e19375290d625f9a17384853b63a02f4742703030aa7c8dcf863f7ade SHA512 c33ea5754eae88f1628d9d53a81db4aaea2598ebca10f2158617b2a2cd9ac3d7cd34dfc9b0314bd096ba0f531dd27fbe8c42a61727dea91fc21852ee601f409e +EBUILD mysql-connector-c-8.0.17-r1.ebuild 2456 BLAKE2B 8c54db2595c732fb34285f673942bd0df1e07ac982cf8622baebfe81f8a9e8f1dd9f87023f3a73a58d9c59129444030d2cd06de4aade0f35c86a365db3477bcd SHA512 ccb6f68dfccc6f94d2897b7931fed8d0df5d5500f60d64e23908b5864ad7b054cd7b1eebcc008f5b4ee99c0254aa75c0478b1bf2c35e5d42d760adf2118614b4 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild index 7fffab40fcc2..73f2092c4ba6 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r2.ebuild @@ -18,7 +18,7 @@ LICENSE="GPL-2" SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz" S="${WORKDIR}/${P}-src" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" SUBSLOT="18" SLOT="0/${SUBSLOT}" 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 index 667251898c9d..c99bb77dd8a1 100644 --- 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 @@ -13,18 +13,16 @@ 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 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" SLOT="0/21" -IUSE="ldap libressl +ssl static-libs" +IUSE="ldap libressl static-libs" RDEPEND=" sys-libs/zlib:=[${MULTILIB_USEDEP}] ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) - ssl? ( - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND}" @@ -37,7 +35,8 @@ 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 + # 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' \ @@ -49,6 +48,7 @@ src_prepare() { -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 @@ -72,7 +72,8 @@ multilib_src_configure() { -DENABLED_LOCAL_INFILE=ON -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" -DWITH_ZLIB=system - -DWITH_SSL=$(usex ssl system wolfssl) + -DWITH_SSL=system + -DWITH_NUMA=OFF -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient -DSHARED_LIB_PATCH_VERSION="0" -DCMAKE_POSITION_INDEPENDENT_CODE=ON |