Diff mariadb-connector-c-3.2.5 with a mariadb-connector-c-3.2.7

/usr/portage/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild 2023-10-09 14:52:29.320368346 +0300
3 3

  
4 4
EAPI=8
5 5

  
6
if [[ "${PV}" == 9999 ]] ; then
6
if [[ ${PV} == 9999 ]] ; then
7 7
	inherit git-r3
8 8
	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
9 9
else
......
16 16

  
17 17
inherit cmake-multilib toolchain-funcs
18 18

  
19
MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
20

  
21
MULTILIB_WRAPPED_HEADERS+=(
22
	/usr/include/mariadb/mariadb_version.h
23
)
24

  
25 19
DESCRIPTION="C client library for MariaDB/MySQL"
26 20
HOMEPAGE="https://mariadb.org/"
27
LICENSE="LGPL-2.1"
28 21

  
22
LICENSE="LGPL-2.1"
29 23
SLOT="0/3"
30 24
IUSE="+curl gnutls kerberos +ssl static-libs test"
31

  
32 25
RESTRICT="!test? ( test )"
33 26

  
34
DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
27
DEPEND="
28
	sys-libs/zlib:=[${MULTILIB_USEDEP}]
35 29
	virtual/libiconv:=[${MULTILIB_USEDEP}]
36
	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
37
	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
38
			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
39
	ssl? (
40
		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
41
		!gnutls? (
42
			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
30
	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
31
	kerberos? (
32
		|| (
33
			app-crypt/mit-krb5[${MULTILIB_USEDEP}]
34
			app-crypt/heimdal[${MULTILIB_USEDEP}]
43 35
		)
44 36
	)
45
	"
37
	ssl? (
38
		gnutls? ( >=net-libs/gnutls-3.3.24:=[${MULTILIB_USEDEP}] )
39
		!gnutls? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
40
	)
41
"
46 42
BDEPEND="test? ( dev-db/mariadb[server] )"
47 43
RDEPEND="${DEPEND}"
44

  
45
MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
46
MULTILIB_WRAPPED_HEADERS+=( /usr/include/mariadb/mariadb_version.h )
47

  
48 48
PATCHES=(
49
	"${FILESDIR}"/gentoo-layout-3.0.patch
50 49
	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
51 50
)
52 51

  
......
66 65
}
67 66

  
68 67
multilib_src_configure() {
69
	# bug 508724 mariadb cannot use ld.gold
68
	# mariadb cannot use ld.gold, bug #508724
70 69
	tc-ld-disable-gold
71 70

  
72 71
	local mycmakeargs=(
73 72
		-DWITH_EXTERNAL_ZLIB=ON
74 73
		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
75
		-DWITH_CURL=$(usex curl ON OFF)
74
		-DWITH_CURL=$(usex curl)
76 75
		-DWITH_ICONV=ON
77 76
		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
78 77
		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
......
81 80
		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
82 81
		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
83 82
		-DINSTALL_BINDIR=bin
84
		-DWITH_UNIT_TESTS=$(usex test ON OFF)
83
		-DWITH_UNIT_TESTS=$(usex test)
85 84
	)
85

  
86 86
	cmake_src_configure
87 87
}
88 88

  
89 89
multilib_src_test() {
90 90
	mkdir -vp "${T}/mysql/data" || die
91

  
91 92
	mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die
92 93
	mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
93
	while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do sleep 1 ; done
94
	cd unittest/libmariadb && MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die
94

  
95
	while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
96
		sleep 1
97
	done
98

  
99
	cd unittest/libmariadb || die
100
	MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die
95 101
}
96 102

  
97 103
multilib_src_install_all() {
Thank you!