diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-22 07:31:18 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-22 07:31:18 +0100 |
| commit | 908778078736bd36f7a60a2d576d415cb8e000fa (patch) | |
| tree | c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /dev-db/mariadb-connector-c | |
| parent | 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff) | |
gentoo resync : 22.05.2021
Diffstat (limited to 'dev-db/mariadb-connector-c')
| -rw-r--r-- | dev-db/mariadb-connector-c/Manifest | 6 | ||||
| -rw-r--r-- | dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild (renamed from dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild) | 26 | ||||
| -rw-r--r-- | dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild | 1 |
3 files changed, 10 insertions, 23 deletions
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest index d090987ecf95..0f2970b68d73 100644 --- a/dev-db/mariadb-connector-c/Manifest +++ b/dev-db/mariadb-connector-c/Manifest @@ -1,9 +1,9 @@ AUX gentoo-layout-3.0.patch 311 BLAKE2B 4c2f0ae8aa53d605bcaf134274d3b549ec970b43cc68eed1ac71cf089c9fa32a1343d7ebfdf428e7f25032f5782aecfb86fb8f78528ffc708ab15dc7285a24e7 SHA512 4d5a48b4dd66aab04ba597b30e96b4601c6745acca21be1daf051ba6ce1e8fef1a0efa46d8e81da1ecdc893a8ee471bd8c7ed0c5436ee33b8b4f7cd18fdca1a5 AUX mariadb-connector-c-3.1.11-fix-flow-control-statement.patch 401 BLAKE2B b5b2a418ffd3ab03304bd9dd8914aa3673f24b9ebc4dc53e9082d3a979fa5858b1431f88c0cd51d23450fe798047a3844774bb89cb0b3c4785e0575ceadfe5e6 SHA512 f052eccae09d6aedc1ed47578a102e72984b39be8fa903421e285eba18eed5d449d1c82262c54ffcec39af044a014edf0dc1102bed1384d575557372ae974d88 AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3d0095a823917704d52a5f16c349ce7017b93b1bebfec01287929470a89a2e4aec2f9f7cd5135368e43f2a2e89257c0d7042b878e1806ede8aa SHA512 fe621abedaf81d1fa367c52f69ccce1765757db8d9f412aa40b440d7e51d4de3785a90150e76893f7066b1ba656eb1bad020465e58adae13f08245b839bde4de -DIST mariadb-connector-c-3.1.11-src.tar.gz 752342 BLAKE2B 5bee575bffdceb1eff60b7ba3fa334882cf2b2a12446cd6c52663cc5ce2e179bcd19c8452e9bdae3877ac7e9e08f4f6a974d136170c399439c42e1759d226c84 SHA512 2da3a5e438037dde2b9fafb07c084c742983ff4ce18f06cf7a34836aace5317cdb2ddb1bca63143367f5ae827c988d99ee20e8f598fabdb06190d9e2191eb3f4 DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 8187199f43ccb6f92ea9df61a1f62e48dbef4744cda9a5e865f71038e47a65dea3ed094dd76d81d0d8d357a8d611a9770590a3504c297ea30f59f285ab511d17 SHA512 a46e8ec976c28e227a72f09c15c92126d178b422a92a4c90fd52c8053604c3309aeb3bd098dc63fbd0d87059d5360c8b63d76e61a1152e7a3e7145e13681453d -EBUILD mariadb-connector-c-3.1.11.ebuild 2342 BLAKE2B f05cf03899e4bef23a6c4180b67cf0b13e265a34724af4dcc4d62fad1aeea2ad792f10c3d87f0e82d7a1c70988fc0ab4ec04387cf2a09bfaadef90a804209efb SHA512 03cac48f19450158b1a3a077f1b1eb07019cc54fa824b7f79d1d271627cdd921f228727e35af9d57872f6be6c36a34d875826473e9948681d9317a2505257000 +DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01 SHA512 a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32 EBUILD mariadb-connector-c-3.1.12.ebuild 2148 BLAKE2B a6328dd0a6416691513398220dda45e3fa4a3f857c5f908f11b06095252e02e15102708181af2aef2e809045ec4fa7617e379517499b27ee3dfb98aaf0cfd98b SHA512 9762c0c60084675e61e5843c7b113ba3809d8f60c082ebc3e0c4a167683cc71cb321de8633fcbe52faf0e4ef9c05e50efb7c8ee3ca6b9b0544e06fa5c89ca890 -EBUILD mariadb-connector-c-9999.ebuild 2154 BLAKE2B af5f36e6b872a597fad0d8b2256a0307df3da04842bf6d535db8bae486d2dcbac666b911c655daaf5dd6b5ff874f37b13353b5adab0bdeedfa4c27a9f7cd11b7 SHA512 00cd17a20ed49b4df3a10a86f31d2551da967567f11bae6ded9b9be8a6b8cc85eff1dcda34aa320e51c6c7d23150e1975c1cf34bbc7900259492f7ff927c72ad +EBUILD mariadb-connector-c-3.1.13.ebuild 2093 BLAKE2B 1a9f992b2e29f63934855ae0a69658db3238ed8c78d72137156de975efd362d6600bd00712dd639b4da920b7ed08f51a14b053d16ecb3a4b776c823045003171 SHA512 8fb3c1e9478c8aee4f1ae70439f46fcc9fc6f454cc9eef2575153496e90de3841372934b211c11b83b967f919c5888072cdc0df60e9e3e8b6e5712c014f4c670 +EBUILD mariadb-connector-c-9999.ebuild 2093 BLAKE2B 1a9f992b2e29f63934855ae0a69658db3238ed8c78d72137156de975efd362d6600bd00712dd639b4da920b7ed08f51a14b053d16ecb3a4b776c823045003171 SHA512 8fb3c1e9478c8aee4f1ae70439f46fcc9fc6f454cc9eef2575153496e90de3841372934b211c11b83b967f919c5888072cdc0df60e9e3e8b6e5712c014f4c670 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9 diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild index 26a82a1b2447..cfae428f3b4f 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild @@ -3,19 +3,19 @@ EAPI=7 -VCS_INHERIT="" if [[ "${PV}" == 9999 ]] ; then - VCS_INHERIT="git-r3" + inherit git-r3 EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git" else MY_PN=${PN#mariadb-} MY_PV=${PV/_b/-b} SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz" S="${WORKDIR%/}/${PN}-${MY_PV}-src" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" fi -inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT} +CMAKE_ECLASS=cmake +inherit cmake-multilib toolchain-funcs MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) @@ -48,16 +48,12 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/gentoo-layout-3.0.patch "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch - "${FILESDIR}"/${PN}-3.1.11-fix-flow-control-statement.patch ) -src_configure() { +multilib_src_configure() { # bug 508724 mariadb cannot use ld.gold tc-ld-disable-gold - multilib-minimal_src_configure -} -multilib_src_configure() { local mycmakeargs=( -DWITH_EXTERNAL_ZLIB=ON -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) @@ -71,19 +67,11 @@ multilib_src_configure() { -DINSTALL_BINDIR=bin -DWITH_UNIT_TESTS=$(usex test ON OFF) ) - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_src_compile -} - -multilib_src_install() { - cmake-utils_src_install + cmake_src_configure } multilib_src_install_all() { if ! use static-libs ; then - find "${D}" -name "*.a" -delete || die + find "${ED}" -name "*.a" -delete || die fi } diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild index c5a4f38b4f7e..cfae428f3b4f 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild @@ -48,7 +48,6 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/gentoo-layout-3.0.patch "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch - "${FILESDIR}"/${PN}-3.1.11-fix-flow-control-statement.patch ) multilib_src_configure() { |