commit: 95b9f947c8f89149169d6899acd259453e311019
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 02:05:11 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 02:17:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b9f947
dev-db/mariadb-connector-c: add 3.2.7
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/mariadb-connector-c/Manifest | 1 +
...999.ebuild => mariadb-connector-c-3.2.7.ebuild} | 56 ++++++++++++----------
.../mariadb-connector-c-9999.ebuild | 56 ++++++++++++----------
3 files changed, 63 insertions(+), 50 deletions(-)
diff --git a/dev-db/mariadb-connector-c/Manifest
b/dev-db/mariadb-connector-c/Manifest
index 816f9f768d2b..9148320c97ae 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,2 +1,3 @@
DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B
4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01
SHA512
a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
DIST mariadb-connector-c-3.2.5-src.tar.gz 992580 BLAKE2B
c850dfbb2241e78475b5f9e9aa0fcb69bc9cc0d17a9092da36e720ec63e3fbdb0add32e6c4508a136fcb43d0825bea7346c0d6ce8a40ae10357ef3d3b6b7bea0
SHA512
5068c95ff15969c6b1d0e2e095fe0bdca3382f478012c852a9745a9bbbfc7586b1eeaa93a55fbadb236499a336133667f4638082814c97ff6b3bbc750c5e59dc
+DIST mariadb-connector-c-3.2.7-src.tar.gz 1212691 BLAKE2B
ae2d1317fdc087c6d64b7cf11f4343bf35662d04da5c693f6f3b45ec405ff0f3d5d03157eb56a9c05cf4e16b9980baffec8800b886ae3d962d22a828a6938671
SHA512
3f0c67c5fd12e889a3704e0a638b64a784f05d12c7c424f7ce64e78a3eb17e2ad588e0e23f0ce037cd49efb695294ab69277da78f02940c2a7ea0676886b9c36
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
similarity index 76%
copy from dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
copy to dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
index 9799342c7442..0660724cbec1 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-if [[ "${PV}" == 9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git";
else
@@ -11,42 +11,41 @@ else
MY_PV=${PV/_b/-b}
SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz";
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
inherit cmake-multilib toolchain-funcs
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
- /usr/include/mariadb/mariadb_version.h
-)
-
DESCRIPTION="C client library for MariaDB/MySQL"
HOMEPAGE="https://mariadb.org/";
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1"
SLOT="0/3"
IUSE="+curl gnutls kerberos +ssl static-libs test"
-
RESTRICT="!test? ( test )"
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+DEPEND="
+ sys-libs/zlib:=[${MULTILIB_USEDEP}]
virtual/libiconv:=[${MULTILIB_USEDEP}]
- curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
- kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
- app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
- ssl? (
- gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
- !gnutls? (
- dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+ curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+ kerberos? (
+ || (
+ app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+ app-crypt/heimdal[${MULTILIB_USEDEP}]
)
)
- "
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-3.3.24:=[${MULTILIB_USEDEP}] )
+ !gnutls? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+ )
+"
BDEPEND="test? ( dev-db/mariadb[server] )"
RDEPEND="${DEPEND}"
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mariadb/mariadb_version.h )
+
PATCHES=(
- "${FILESDIR}"/gentoo-layout-3.0.patch
"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
)
@@ -66,13 +65,13 @@ src_prepare() {
}
multilib_src_configure() {
- # bug 508724 mariadb cannot use ld.gold
+ # mariadb cannot use ld.gold, bug #508724
tc-ld-disable-gold
local mycmakeargs=(
-DWITH_EXTERNAL_ZLIB=ON
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
- -DWITH_CURL=$(usex curl ON OFF)
+ -DWITH_CURL=$(usex curl)
-DWITH_ICONV=ON
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos
DYNAMIC OFF)
-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
@@ -81,17 +80,24 @@ multilib_src_configure() {
-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-DINSTALL_BINDIR=bin
- -DWITH_UNIT_TESTS=$(usex test ON OFF)
+ -DWITH_UNIT_TESTS=$(usex test)
)
+
cmake_src_configure
}
multilib_src_test() {
mkdir -vp "${T}/mysql/data" || die
+
mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die
mysqld --no-defaults --datadir="${T}/mysql/data"
--socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
- while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
sleep 1 ; done
- cd unittest/libmariadb && MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock"
MARIADB_CC_TEST=1 ctest --verbose || die
+
+ while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
+ sleep 1
+ done
+
+ cd unittest/libmariadb || die
+ MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest
--verbose || die
}
multilib_src_install_all() {
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 9799342c7442..0660724cbec1 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-if [[ "${PV}" == 9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git";
else
@@ -11,42 +11,41 @@ else
MY_PV=${PV/_b/-b}
SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz";
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
inherit cmake-multilib toolchain-funcs
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
- /usr/include/mariadb/mariadb_version.h
-)
-
DESCRIPTION="C client library for MariaDB/MySQL"
HOMEPAGE="https://mariadb.org/";
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1"
SLOT="0/3"
IUSE="+curl gnutls kerberos +ssl static-libs test"
-
RESTRICT="!test? ( test )"
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+DEPEND="
+ sys-libs/zlib:=[${MULTILIB_USEDEP}]
virtual/libiconv:=[${MULTILIB_USEDEP}]
- curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
- kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
- app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
- ssl? (
- gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
- !gnutls? (
- dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+ curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+ kerberos? (
+ || (
+ app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+ app-crypt/heimdal[${MULTILIB_USEDEP}]
)
)
- "
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-3.3.24:=[${MULTILIB_USEDEP}] )
+ !gnutls? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+ )
+"
BDEPEND="test? ( dev-db/mariadb[server] )"
RDEPEND="${DEPEND}"
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mariadb/mariadb_version.h )
+
PATCHES=(
- "${FILESDIR}"/gentoo-layout-3.0.patch
"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
)
@@ -66,13 +65,13 @@ src_prepare() {
}
multilib_src_configure() {
- # bug 508724 mariadb cannot use ld.gold
+ # mariadb cannot use ld.gold, bug #508724
tc-ld-disable-gold
local mycmakeargs=(
-DWITH_EXTERNAL_ZLIB=ON
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
- -DWITH_CURL=$(usex curl ON OFF)
+ -DWITH_CURL=$(usex curl)
-DWITH_ICONV=ON
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos
DYNAMIC OFF)
-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
@@ -81,17 +80,24 @@ multilib_src_configure() {
-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-DINSTALL_BINDIR=bin
- -DWITH_UNIT_TESTS=$(usex test ON OFF)
+ -DWITH_UNIT_TESTS=$(usex test)
)
+
cmake_src_configure
}
multilib_src_test() {
mkdir -vp "${T}/mysql/data" || die
+
mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die
mysqld --no-defaults --datadir="${T}/mysql/data"
--socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
- while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
sleep 1 ; done
- cd unittest/libmariadb && MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock"
MARIADB_CC_TEST=1 ctest --verbose || die
+
+ while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
+ sleep 1
+ done
+
+ cd unittest/libmariadb || die
+ MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest
--verbose || die
}
multilib_src_install_all() {
