1 |
commit: cc67804b489142b48cb3c9316c5b92324068794f |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 7 18:59:34 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 7 19:12:24 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc67804b |
7 |
|
8 |
dev-db/mariadb-connector-c: bump to v3.1.3 |
9 |
|
10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
dev-db/mariadb-connector-c/Manifest | 1 + |
14 |
...riadb-connector-c-3.1.3-fix-pkconfig-file.patch | 21 ++++++ |
15 |
.../mariadb-connector-c-3.1.3.ebuild | 86 ++++++++++++++++++++++ |
16 |
3 files changed, 108 insertions(+) |
17 |
|
18 |
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest |
19 |
index 9581259d514..da04c0403d7 100644 |
20 |
--- a/dev-db/mariadb-connector-c/Manifest |
21 |
+++ b/dev-db/mariadb-connector-c/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e |
24 |
DIST mariadb-connector-c-3.0.9-src.tar.gz 668142 BLAKE2B f61f855c334268b1cb079abc566a600093d7e0bdd164c22045000e337f43d2b57d14988cba1b3fd2f6316f6e0d949be7e67ac73410ddb1abc66e0faa16422946 SHA512 6f45bcd4bee07f6d72d1c4fee0bdb903ef4fa879eb7508156bc885a5657caf69b145d95647c4bc663eb2a2b03569b41ef9d87ca532b77901c2f67fd608048a1a |
25 |
DIST mariadb-connector-c-3.1.2-src.tar.gz 735530 BLAKE2B c441cb69b0affaaa5ed87a9e81232ef2dfab305bf5d92ad60ad0198508294c1153ad517347d2af1336722149200a1a62ddd4c289913b09de0195c9da79279305 SHA512 8ad0ec5aea07a04e7ac9da6af3d067755dd8f22deed071de2321c581374b5ed1e4d6bab048b231655d3c2a3722b2b99f276d95046c659f867cbd58d772fb17bb |
26 |
+DIST mariadb-connector-c-3.1.3-src.tar.gz 738250 BLAKE2B a3ea70d2dc226b7c8e907dddaa39e280a76fac7b0a8a74971aa9cc6c1fadf3e5cb96fb3f55e29a639a899d5eeb30dd28d4cfaef0256f030af86909d68e9f85dc SHA512 ca3809a5f1a33317962908ee40d5c339ba6b02c5c8818bf12af9b78eb2289efad711ab74ac7706d711951b22957ba897b5e80b60e8df44924ca70569a4e1c5e7 |
27 |
|
28 |
diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.3-fix-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.3-fix-pkconfig-file.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..ea4798ea943 |
31 |
--- /dev/null |
32 |
+++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.3-fix-pkconfig-file.patch |
33 |
@@ -0,0 +1,21 @@ |
34 |
+--- a/mariadb_config/libmariadb.pc.in |
35 |
++++ b/mariadb_config/libmariadb.pc.in |
36 |
+@@ -7,14 +7,13 @@ |
37 |
+ # |
38 |
+ |
39 |
+ prefix=@CMAKE_INSTALL_PREFIX@ |
40 |
+-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@ |
41 |
+-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@ |
42 |
++includedir=${prefix}/include |
43 |
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
44 |
+ |
45 |
+ Name: libmariadb |
46 |
+ Version: @CPACK_PACKAGE_VERSION@ |
47 |
++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/ |
48 |
+ Description: MariaDB Connector/C dynamic library |
49 |
+-Cflags: -I${includedir} |
50 |
++Cflags: -I${includedir}/mariadb |
51 |
+ Libs: -L${libdir} -lmariadb |
52 |
+ Libs.private: @extra_dynamic_LDFLAGS@ |
53 |
+- |
54 |
+- |
55 |
|
56 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.3.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.3.ebuild |
57 |
new file mode 100644 |
58 |
index 00000000000..234dbab6974 |
59 |
--- /dev/null |
60 |
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.3.ebuild |
61 |
@@ -0,0 +1,86 @@ |
62 |
+# Copyright 1999-2019 Gentoo Authors |
63 |
+# Distributed under the terms of the GNU General Public License v2 |
64 |
+ |
65 |
+EAPI=7 |
66 |
+ |
67 |
+VCS_INHERIT="" |
68 |
+if [[ "${PV}" == 9999 ]] ; then |
69 |
+ VCS_INHERIT="git-r3" |
70 |
+ EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git" |
71 |
+else |
72 |
+ MY_PN=${PN#mariadb-} |
73 |
+ MY_PV=${PV/_b/-b} |
74 |
+ SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz" |
75 |
+ S="${WORKDIR%/}/${PN}-${MY_PV}-src" |
76 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" |
77 |
+fi |
78 |
+ |
79 |
+inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT} |
80 |
+ |
81 |
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config ) |
82 |
+ |
83 |
+MULTILIB_WRAPPED_HEADERS+=( |
84 |
+ /usr/include/mariadb/mariadb_version.h |
85 |
+) |
86 |
+ |
87 |
+DESCRIPTION="C client library for MariaDB/MySQL" |
88 |
+HOMEPAGE="https://mariadb.org/" |
89 |
+LICENSE="LGPL-2.1" |
90 |
+ |
91 |
+SLOT="0/3" |
92 |
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test" |
93 |
+ |
94 |
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
95 |
+ virtual/libiconv:=[${MULTILIB_USEDEP}] |
96 |
+ curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] ) |
97 |
+ kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] |
98 |
+ app-crypt/heimdal[${MULTILIB_USEDEP}] ) ) |
99 |
+ ssl? ( |
100 |
+ gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] ) |
101 |
+ !gnutls? ( |
102 |
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
103 |
+ !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
104 |
+ ) |
105 |
+ ) |
106 |
+ " |
107 |
+RDEPEND="${DEPEND}" |
108 |
+PATCHES=( |
109 |
+ "${FILESDIR}"/gentoo-layout-3.0.patch |
110 |
+ "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch |
111 |
+) |
112 |
+ |
113 |
+src_configure() { |
114 |
+ # bug 508724 mariadb cannot use ld.gold |
115 |
+ tc-ld-disable-gold |
116 |
+ multilib-minimal_src_configure |
117 |
+} |
118 |
+ |
119 |
+multilib_src_configure() { |
120 |
+ local mycmakeargs=( |
121 |
+ -DWITH_EXTERNAL_ZLIB=ON |
122 |
+ -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) |
123 |
+ -DWITH_CURL=$(usex curl ON OFF) |
124 |
+ -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF) |
125 |
+ -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" |
126 |
+ -DINSTALL_LIBDIR="$(get_libdir)" |
127 |
+ -DINSTALL_PCDIR="$(get_libdir)/pkgconfig" |
128 |
+ -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" |
129 |
+ -DINSTALL_BINDIR=bin |
130 |
+ -DWITH_UNIT_TESTS=$(usex test ON OFF) |
131 |
+ ) |
132 |
+ cmake-utils_src_configure |
133 |
+} |
134 |
+ |
135 |
+multilib_src_compile() { |
136 |
+ cmake-utils_src_compile |
137 |
+} |
138 |
+ |
139 |
+multilib_src_install() { |
140 |
+ cmake-utils_src_install |
141 |
+} |
142 |
+ |
143 |
+multilib_src_install_all() { |
144 |
+ if ! use static-libs ; then |
145 |
+ find "${D}" -name "*.a" -delete || die |
146 |
+ fi |
147 |
+} |