| 1 |
commit: 95b9f947c8f89149169d6899acd259453e311019 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 31 02:05:11 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 31 02:17:37 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b9f947 |
| 7 |
|
| 8 |
dev-db/mariadb-connector-c: add 3.2.7 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-db/mariadb-connector-c/Manifest | 1 + |
| 13 |
...999.ebuild => mariadb-connector-c-3.2.7.ebuild} | 56 ++++++++++++---------- |
| 14 |
.../mariadb-connector-c-9999.ebuild | 56 ++++++++++++---------- |
| 15 |
3 files changed, 63 insertions(+), 50 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest |
| 18 |
index 816f9f768d2b..9148320c97ae 100644 |
| 19 |
--- a/dev-db/mariadb-connector-c/Manifest |
| 20 |
+++ b/dev-db/mariadb-connector-c/Manifest |
| 21 |
@@ -1,2 +1,3 @@ |
| 22 |
DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01 SHA512 a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32 |
| 23 |
DIST mariadb-connector-c-3.2.5-src.tar.gz 992580 BLAKE2B c850dfbb2241e78475b5f9e9aa0fcb69bc9cc0d17a9092da36e720ec63e3fbdb0add32e6c4508a136fcb43d0825bea7346c0d6ce8a40ae10357ef3d3b6b7bea0 SHA512 5068c95ff15969c6b1d0e2e095fe0bdca3382f478012c852a9745a9bbbfc7586b1eeaa93a55fbadb236499a336133667f4638082814c97ff6b3bbc750c5e59dc |
| 24 |
+DIST mariadb-connector-c-3.2.7-src.tar.gz 1212691 BLAKE2B ae2d1317fdc087c6d64b7cf11f4343bf35662d04da5c693f6f3b45ec405ff0f3d5d03157eb56a9c05cf4e16b9980baffec8800b886ae3d962d22a828a6938671 SHA512 3f0c67c5fd12e889a3704e0a638b64a784f05d12c7c424f7ce64e78a3eb17e2ad588e0e23f0ce037cd49efb695294ab69277da78f02940c2a7ea0676886b9c36 |
| 25 |
|
| 26 |
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 |
| 27 |
similarity index 76% |
| 28 |
copy from dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
| 29 |
copy to dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild |
| 30 |
index 9799342c7442..0660724cbec1 100644 |
| 31 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
| 32 |
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild |
| 33 |
@@ -3,7 +3,7 @@ |
| 34 |
|
| 35 |
EAPI=8 |
| 36 |
|
| 37 |
-if [[ "${PV}" == 9999 ]] ; then |
| 38 |
+if [[ ${PV} == 9999 ]] ; then |
| 39 |
inherit git-r3 |
| 40 |
EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git" |
| 41 |
else |
| 42 |
@@ -11,42 +11,41 @@ else |
| 43 |
MY_PV=${PV/_b/-b} |
| 44 |
SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz" |
| 45 |
S="${WORKDIR%/}/${PN}-${MY_PV}-src" |
| 46 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
| 47 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
| 48 |
fi |
| 49 |
|
| 50 |
inherit cmake-multilib toolchain-funcs |
| 51 |
|
| 52 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
| 53 |
- |
| 54 |
-MULTILIB_WRAPPED_HEADERS+=( |
| 55 |
- /usr/include/mariadb/mariadb_version.h |
| 56 |
-) |
| 57 |
- |
| 58 |
DESCRIPTION="C client library for MariaDB/MySQL" |
| 59 |
HOMEPAGE="https://mariadb.org/" |
| 60 |
-LICENSE="LGPL-2.1" |
| 61 |
|
| 62 |
+LICENSE="LGPL-2.1" |
| 63 |
SLOT="0/3" |
| 64 |
IUSE="+curl gnutls kerberos +ssl static-libs test" |
| 65 |
- |
| 66 |
RESTRICT="!test? ( test )" |
| 67 |
|
| 68 |
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 69 |
+DEPEND=" |
| 70 |
+ sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 71 |
virtual/libiconv:=[${MULTILIB_USEDEP}] |
| 72 |
- curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] ) |
| 73 |
- kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] |
| 74 |
- app-crypt/heimdal[${MULTILIB_USEDEP}] ) ) |
| 75 |
- ssl? ( |
| 76 |
- gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] ) |
| 77 |
- !gnutls? ( |
| 78 |
- dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
| 79 |
+ curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) |
| 80 |
+ kerberos? ( |
| 81 |
+ || ( |
| 82 |
+ app-crypt/mit-krb5[${MULTILIB_USEDEP}] |
| 83 |
+ app-crypt/heimdal[${MULTILIB_USEDEP}] |
| 84 |
) |
| 85 |
) |
| 86 |
- " |
| 87 |
+ ssl? ( |
| 88 |
+ gnutls? ( >=net-libs/gnutls-3.3.24:=[${MULTILIB_USEDEP}] ) |
| 89 |
+ !gnutls? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) |
| 90 |
+ ) |
| 91 |
+" |
| 92 |
BDEPEND="test? ( dev-db/mariadb[server] )" |
| 93 |
RDEPEND="${DEPEND}" |
| 94 |
+ |
| 95 |
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
| 96 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mariadb/mariadb_version.h ) |
| 97 |
+ |
| 98 |
PATCHES=( |
| 99 |
- "${FILESDIR}"/gentoo-layout-3.0.patch |
| 100 |
"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch |
| 101 |
) |
| 102 |
|
| 103 |
@@ -66,13 +65,13 @@ src_prepare() { |
| 104 |
} |
| 105 |
|
| 106 |
multilib_src_configure() { |
| 107 |
- # bug 508724 mariadb cannot use ld.gold |
| 108 |
+ # mariadb cannot use ld.gold, bug #508724 |
| 109 |
tc-ld-disable-gold |
| 110 |
|
| 111 |
local mycmakeargs=( |
| 112 |
-DWITH_EXTERNAL_ZLIB=ON |
| 113 |
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) |
| 114 |
- -DWITH_CURL=$(usex curl ON OFF) |
| 115 |
+ -DWITH_CURL=$(usex curl) |
| 116 |
-DWITH_ICONV=ON |
| 117 |
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF) |
| 118 |
-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
| 119 |
@@ -81,17 +80,24 @@ multilib_src_configure() { |
| 120 |
-DINSTALL_PCDIR="$(get_libdir)/pkgconfig" |
| 121 |
-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" |
| 122 |
-DINSTALL_BINDIR=bin |
| 123 |
- -DWITH_UNIT_TESTS=$(usex test ON OFF) |
| 124 |
+ -DWITH_UNIT_TESTS=$(usex test) |
| 125 |
) |
| 126 |
+ |
| 127 |
cmake_src_configure |
| 128 |
} |
| 129 |
|
| 130 |
multilib_src_test() { |
| 131 |
mkdir -vp "${T}/mysql/data" || die |
| 132 |
+ |
| 133 |
mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die |
| 134 |
mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking & |
| 135 |
- while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do sleep 1 ; done |
| 136 |
- cd unittest/libmariadb && MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die |
| 137 |
+ |
| 138 |
+ while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do |
| 139 |
+ sleep 1 |
| 140 |
+ done |
| 141 |
+ |
| 142 |
+ cd unittest/libmariadb || die |
| 143 |
+ MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die |
| 144 |
} |
| 145 |
|
| 146 |
multilib_src_install_all() { |
| 147 |
|
| 148 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
| 149 |
index 9799342c7442..0660724cbec1 100644 |
| 150 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
| 151 |
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
| 152 |
@@ -3,7 +3,7 @@ |
| 153 |
|
| 154 |
EAPI=8 |
| 155 |
|
| 156 |
-if [[ "${PV}" == 9999 ]] ; then |
| 157 |
+if [[ ${PV} == 9999 ]] ; then |
| 158 |
inherit git-r3 |
| 159 |
EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git" |
| 160 |
else |
| 161 |
@@ -11,42 +11,41 @@ else |
| 162 |
MY_PV=${PV/_b/-b} |
| 163 |
SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz" |
| 164 |
S="${WORKDIR%/}/${PN}-${MY_PV}-src" |
| 165 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
| 166 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
| 167 |
fi |
| 168 |
|
| 169 |
inherit cmake-multilib toolchain-funcs |
| 170 |
|
| 171 |
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
| 172 |
- |
| 173 |
-MULTILIB_WRAPPED_HEADERS+=( |
| 174 |
- /usr/include/mariadb/mariadb_version.h |
| 175 |
-) |
| 176 |
- |
| 177 |
DESCRIPTION="C client library for MariaDB/MySQL" |
| 178 |
HOMEPAGE="https://mariadb.org/" |
| 179 |
-LICENSE="LGPL-2.1" |
| 180 |
|
| 181 |
+LICENSE="LGPL-2.1" |
| 182 |
SLOT="0/3" |
| 183 |
IUSE="+curl gnutls kerberos +ssl static-libs test" |
| 184 |
- |
| 185 |
RESTRICT="!test? ( test )" |
| 186 |
|
| 187 |
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 188 |
+DEPEND=" |
| 189 |
+ sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 190 |
virtual/libiconv:=[${MULTILIB_USEDEP}] |
| 191 |
- curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] ) |
| 192 |
- kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] |
| 193 |
- app-crypt/heimdal[${MULTILIB_USEDEP}] ) ) |
| 194 |
- ssl? ( |
| 195 |
- gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] ) |
| 196 |
- !gnutls? ( |
| 197 |
- dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
| 198 |
+ curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) |
| 199 |
+ kerberos? ( |
| 200 |
+ || ( |
| 201 |
+ app-crypt/mit-krb5[${MULTILIB_USEDEP}] |
| 202 |
+ app-crypt/heimdal[${MULTILIB_USEDEP}] |
| 203 |
) |
| 204 |
) |
| 205 |
- " |
| 206 |
+ ssl? ( |
| 207 |
+ gnutls? ( >=net-libs/gnutls-3.3.24:=[${MULTILIB_USEDEP}] ) |
| 208 |
+ !gnutls? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) |
| 209 |
+ ) |
| 210 |
+" |
| 211 |
BDEPEND="test? ( dev-db/mariadb[server] )" |
| 212 |
RDEPEND="${DEPEND}" |
| 213 |
+ |
| 214 |
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
| 215 |
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mariadb/mariadb_version.h ) |
| 216 |
+ |
| 217 |
PATCHES=( |
| 218 |
- "${FILESDIR}"/gentoo-layout-3.0.patch |
| 219 |
"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch |
| 220 |
) |
| 221 |
|
| 222 |
@@ -66,13 +65,13 @@ src_prepare() { |
| 223 |
} |
| 224 |
|
| 225 |
multilib_src_configure() { |
| 226 |
- # bug 508724 mariadb cannot use ld.gold |
| 227 |
+ # mariadb cannot use ld.gold, bug #508724 |
| 228 |
tc-ld-disable-gold |
| 229 |
|
| 230 |
local mycmakeargs=( |
| 231 |
-DWITH_EXTERNAL_ZLIB=ON |
| 232 |
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) |
| 233 |
- -DWITH_CURL=$(usex curl ON OFF) |
| 234 |
+ -DWITH_CURL=$(usex curl) |
| 235 |
-DWITH_ICONV=ON |
| 236 |
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF) |
| 237 |
-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
| 238 |
@@ -81,17 +80,24 @@ multilib_src_configure() { |
| 239 |
-DINSTALL_PCDIR="$(get_libdir)/pkgconfig" |
| 240 |
-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" |
| 241 |
-DINSTALL_BINDIR=bin |
| 242 |
- -DWITH_UNIT_TESTS=$(usex test ON OFF) |
| 243 |
+ -DWITH_UNIT_TESTS=$(usex test) |
| 244 |
) |
| 245 |
+ |
| 246 |
cmake_src_configure |
| 247 |
} |
| 248 |
|
| 249 |
multilib_src_test() { |
| 250 |
mkdir -vp "${T}/mysql/data" || die |
| 251 |
+ |
| 252 |
mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die |
| 253 |
mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking & |
| 254 |
- while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do sleep 1 ; done |
| 255 |
- cd unittest/libmariadb && MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die |
| 256 |
+ |
| 257 |
+ while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do |
| 258 |
+ sleep 1 |
| 259 |
+ done |
| 260 |
+ |
| 261 |
+ cd unittest/libmariadb || die |
| 262 |
+ MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die |
| 263 |
} |
| 264 |
|
| 265 |
multilib_src_install_all() { |
Archives