Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/
Date: Thu, 17 Jun 2021 13:14:03
Message-Id: 1623935633.9fd6c9fcc8a51a966a84829ac7175e1d6a8d2097.whissi@gentoo
1 commit: 9fd6c9fcc8a51a966a84829ac7175e1d6a8d2097
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 17 11:55:06 2021 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 17 13:13:53 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fd6c9fc
7
8 dev-db/mariadb: install CONNECT storage engine
9
10 Closes: https://bugs.gentoo.org/794217
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 dev-db/mariadb/mariadb-10.2.38.ebuild | 10 +++++-----
15 dev-db/mariadb/mariadb-10.3.29.ebuild | 10 +++++-----
16 dev-db/mariadb/mariadb-10.4.19.ebuild | 10 +++++-----
17 dev-db/mariadb/mariadb-10.5.10.ebuild | 7 +++----
18 4 files changed, 18 insertions(+), 19 deletions(-)
19
20 diff --git a/dev-db/mariadb/mariadb-10.2.38.ebuild b/dev-db/mariadb/mariadb-10.2.38.ebuild
21 index ed459dd6467..c8f7dd82f04 100644
22 --- a/dev-db/mariadb/mariadb-10.2.38.ebuild
23 +++ b/dev-db/mariadb/mariadb-10.2.38.ebuild
24 @@ -364,12 +364,14 @@ src_configure() {
25 )
26
27 if use server ; then
28 -
29 - # Federated{,X} must be treated special otherwise they will not be built as plugins
30 + # Connect and Federated{,X} must be treated special
31 + # otherwise they will not be built as plugins
32 if ! use extraengine ; then
33 mycmakeargs+=(
34 + -DPLUGIN_CONNECT=NO
35 -DPLUGIN_FEDERATED=NO
36 - -DPLUGIN_FEDERATEDX=NO )
37 + -DPLUGIN_FEDERATEDX=NO
38 + )
39 fi
40
41 mycmakeargs+=(
42 @@ -383,7 +385,6 @@ src_configure() {
43 -DPLUGIN_CASSANDRA=NO
44 -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
45 -DPLUGIN_SPIDER=$(usex extraengine YES NO)
46 - -DPLUGIN_CONNECT=$(usex extraengine YES NO)
47 -DCONNECT_WITH_MYSQL=1
48 -DCONNECT_WITH_LIBXML2=$(usex xml)
49 -DCONNECT_WITH_ODBC=$(usex odbc)
50 @@ -462,7 +463,6 @@ src_configure() {
51 -DWITH_MYISAM_STORAGE_ENGINE=1
52 -DWITH_PARTITION_STORAGE_ENGINE=1
53 )
54 -
55 else
56 mycmakeargs+=(
57 -DWITHOUT_SERVER=1
58
59 diff --git a/dev-db/mariadb/mariadb-10.3.29.ebuild b/dev-db/mariadb/mariadb-10.3.29.ebuild
60 index bb627f3fe8a..41f203c8dbc 100644
61 --- a/dev-db/mariadb/mariadb-10.3.29.ebuild
62 +++ b/dev-db/mariadb/mariadb-10.3.29.ebuild
63 @@ -355,12 +355,14 @@ src_configure() {
64 )
65
66 if use server ; then
67 -
68 - # Federated{,X} must be treated special otherwise they will not be built as plugins
69 + # Connect and Federated{,X} must be treated special
70 + # otherwise they will not be built as plugins
71 if ! use extraengine ; then
72 mycmakeargs+=(
73 + -DPLUGIN_CONNECT=NO
74 -DPLUGIN_FEDERATED=NO
75 - -DPLUGIN_FEDERATEDX=NO )
76 + -DPLUGIN_FEDERATEDX=NO
77 + )
78 fi
79
80 mycmakeargs+=(
81 @@ -373,7 +375,6 @@ src_configure() {
82 -DPLUGIN_CASSANDRA=NO
83 -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
84 -DPLUGIN_SPIDER=$(usex extraengine YES NO)
85 - -DPLUGIN_CONNECT=$(usex extraengine YES NO)
86 -DCONNECT_WITH_MYSQL=1
87 -DCONNECT_WITH_LIBXML2=$(usex xml)
88 -DCONNECT_WITH_ODBC=$(usex odbc)
89 @@ -452,7 +453,6 @@ src_configure() {
90 -DWITH_MYISAM_STORAGE_ENGINE=1
91 -DWITH_PARTITION_STORAGE_ENGINE=1
92 )
93 -
94 else
95 mycmakeargs+=(
96 -DWITHOUT_SERVER=1
97
98 diff --git a/dev-db/mariadb/mariadb-10.4.19.ebuild b/dev-db/mariadb/mariadb-10.4.19.ebuild
99 index ca2d2d41378..f92c3cf86a7 100644
100 --- a/dev-db/mariadb/mariadb-10.4.19.ebuild
101 +++ b/dev-db/mariadb/mariadb-10.4.19.ebuild
102 @@ -369,12 +369,14 @@ src_configure() {
103 )
104
105 if use server ; then
106 -
107 - # Federated{,X} must be treated special otherwise they will not be built as plugins
108 + # Connect and Federated{,X} must be treated special
109 + # otherwise they will not be built as plugins
110 if ! use extraengine ; then
111 mycmakeargs+=(
112 + -DPLUGIN_CONNECT=NO
113 -DPLUGIN_FEDERATED=NO
114 - -DPLUGIN_FEDERATEDX=NO )
115 + -DPLUGIN_FEDERATEDX=NO
116 + )
117 fi
118
119 mycmakeargs+=(
120 @@ -387,7 +389,6 @@ src_configure() {
121 -DPLUGIN_CASSANDRA=NO
122 -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
123 -DPLUGIN_SPIDER=$(usex extraengine YES NO)
124 - -DPLUGIN_CONNECT=$(usex extraengine YES NO)
125 -DCONNECT_WITH_MYSQL=1
126 -DCONNECT_WITH_LIBXML2=$(usex xml)
127 -DCONNECT_WITH_ODBC=$(usex odbc)
128 @@ -466,7 +467,6 @@ src_configure() {
129 -DWITH_MYISAM_STORAGE_ENGINE=1
130 -DWITH_PARTITION_STORAGE_ENGINE=1
131 )
132 -
133 else
134 mycmakeargs+=(
135 -DWITHOUT_SERVER=1
136
137 diff --git a/dev-db/mariadb/mariadb-10.5.10.ebuild b/dev-db/mariadb/mariadb-10.5.10.ebuild
138 index ecedb5844ba..8d6b3bc32fa 100644
139 --- a/dev-db/mariadb/mariadb-10.5.10.ebuild
140 +++ b/dev-db/mariadb/mariadb-10.5.10.ebuild
141 @@ -365,10 +365,11 @@ src_configure() {
142 )
143
144 if use server ; then
145 -
146 - # Federated{,X} must be treated special otherwise they will not be built as plugins
147 + # Connect and Federated{,X} must be treated special
148 + # otherwise they will not be built as plugins
149 if ! use extraengine ; then
150 mycmakeargs+=(
151 + -DPLUGIN_CONNECT=NO
152 -DPLUGIN_FEDERATED=NO
153 -DPLUGIN_FEDERATEDX=NO
154 )
155 @@ -385,7 +386,6 @@ src_configure() {
156 -DPLUGIN_SPIDER=$(usex extraengine YES NO)
157 -DPLUGIN_S3=$(usex s3 YES NO)
158 -DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO)
159 - -DPLUGIN_CONNECT=$(usex extraengine YES NO)
160 -DCONNECT_WITH_MYSQL=1
161 -DCONNECT_WITH_LIBXML2=$(usex xml)
162 -DCONNECT_WITH_ODBC=$(usex odbc)
163 @@ -461,7 +461,6 @@ src_configure() {
164 -DWITH_MYISAM_STORAGE_ENGINE=1
165 -DWITH_PARTITION_STORAGE_ENGINE=1
166 )
167 -
168 else
169 mycmakeargs+=(
170 -DWITHOUT_SERVER=1
Report Message
Find on MARC Find on Google Groups