1 |
commit: eecc1c218f350d21696a4561304eb602b6b481f7 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 4 13:01:58 2019 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 4 13:01:58 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eecc1c21 |
7 |
|
8 |
sys-cluster/galera: Version bump for 25.3.26 |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
12 |
|
13 |
sys-cluster/galera/Manifest | 1 + |
14 |
.../files/galera-4.1-strip-extra-cflags.patch | 78 +++++++++++++++++++ |
15 |
sys-cluster/galera/galera-25.3.26.ebuild | 89 ++++++++++++++++++++++ |
16 |
3 files changed, 168 insertions(+) |
17 |
|
18 |
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest |
19 |
index a57bcbf8a0d..fbf08c233a0 100644 |
20 |
--- a/sys-cluster/galera/Manifest |
21 |
+++ b/sys-cluster/galera/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
+DIST galera-25.3.26.tar.gz 3386588 BLAKE2B ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4 SHA512 c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4 |
24 |
DIST galera-3-25.3.23.tar.gz 3328961 BLAKE2B d11c6d00fda367fc961a5387865afa74e1ed0ed04094a4ab3c5ab23c7a915131b867a85f74079dc472df745762346b8b9fd371d5d0d0406e20274d51917129b5 SHA512 5b6a61ddd1505f9e2f9e3c592d65e17ee55ee78187d423f8f963d9c7b8deed2c1ade3425262d0a89622693853dff95d429861c955b2d051433dda8929d9f92d1 |
25 |
DIST galera-3-25.3.24.tar.gz 3373375 BLAKE2B db837add9d74e2acb312bd974f00b52d269f1c5995036b468f309da43605b817fac16f17c30e96c27e17657708870d329b41eafa9ad214d8cb5f1b4fbb468182 SHA512 874c6ee77be54a0bcd6d36b67f8e99d12dabd85433dd1f0e026b7994746679cc7ffebcf721445dfd1714f89c7594fc0b0137e725d220d3bb45fd325e64e16185 |
26 |
DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03 |
27 |
|
28 |
diff --git a/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..dfa1642c7d7 |
31 |
--- /dev/null |
32 |
+++ b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch |
33 |
@@ -0,0 +1,78 @@ |
34 |
+diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript |
35 |
+--- a/galerautils/src/SConscript 2019-02-25 10:37:25.000000000 -0500 |
36 |
++++ b/galerautils/src/SConscript 2019-03-07 09:51:27.163226469 -0500 |
37 |
+@@ -1,4 +1,4 @@ |
38 |
+-Import('env', 'x86', 'sysname', 'machine') |
39 |
++Import('env', 'sysname', 'machine') |
40 |
+ |
41 |
+ libgalerautils_env = env.Clone() |
42 |
+ |
43 |
+@@ -39,22 +39,6 @@ |
44 |
+ crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ] |
45 |
+ crc32c_objs = crc32c_env.SharedObject(crc32c_sources) |
46 |
+ |
47 |
+-if x86: |
48 |
+- if machine != 'ppc64' and machine != 'ppc64le': |
49 |
+- crc32c_env.Append(CFLAGS = ' -msse4.2') |
50 |
+- if sysname == 'sunos': |
51 |
+- # Ideally we want to simply strip SSE4.2 flag from the resulting |
52 |
+- # crc32.pic.o |
53 |
+- # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html) |
54 |
+- # but that requires some serious scons-fu, so we just don't |
55 |
+- # compile hardware support in if host CPU does not have it. |
56 |
+- from subprocess import check_call |
57 |
+- try: |
58 |
+- check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True); |
59 |
+- except: |
60 |
+- libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE') |
61 |
+- crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE') |
62 |
+- |
63 |
+ libgalerautils_env.StaticLibrary('galerautils', |
64 |
+ libgalerautils_objs + crc32c_objs) |
65 |
+ |
66 |
+diff -aurN a/SConstruct b/SConstruct |
67 |
+--- a/SConstruct 2019-03-07 09:44:38.588841625 -0500 |
68 |
++++ b/SConstruct 2019-03-07 09:50:06.305952407 -0500 |
69 |
+@@ -67,7 +67,7 @@ |
70 |
+ build_target = 'all' |
71 |
+ |
72 |
+ # Optimization level |
73 |
+-opt_flags = ' -g -O3 -DNDEBUG' |
74 |
++opt_flags = ' -DNDEBUG' |
75 |
+ |
76 |
+ # Architecture (defaults to build host type) |
77 |
+ compile_arch = '' |
78 |
+@@ -120,33 +120,6 @@ |
79 |
+ if gcov: |
80 |
+ opt_flags = opt_flags + ' --coverage -g' |
81 |
+ |
82 |
+-if sysname == 'sunos': |
83 |
+- compile_arch = ' -mtune=native' |
84 |
+-elif x86: |
85 |
+- if bits == 32: |
86 |
+- if machine == 'x86_64': |
87 |
+- compile_arch = ' -mx32' |
88 |
+- else: |
89 |
+- compile_arch = ' -m32 -march=i686' |
90 |
+- if sysname == 'linux': |
91 |
+- link_arch = ' -Wl,-melf_i386' |
92 |
+- else: |
93 |
+- if machine == 'ppc64': |
94 |
+- compile_arch = ' -mtune=native' |
95 |
+- link_arch = ' -Wl,-melf64ppc' |
96 |
+- elif machine == 'ppc64le': |
97 |
+- compile_arch = ' -mtune=native' |
98 |
+- link_arch = ' -Wl,-melf64lppc' |
99 |
+- else: |
100 |
+- compile_arch = ' -m64' |
101 |
+- if sysname == 'linux': |
102 |
+- link_arch = ' -Wl,-melf_x86_64' |
103 |
+- link_arch = compile_arch + link_arch |
104 |
+-elif machine == 's390x': |
105 |
+- compile_arch = ' -mzarch' |
106 |
+- if bits == 32: |
107 |
+- compile_arch += ' -m32' |
108 |
+- |
109 |
+ boost = int(ARGUMENTS.get('boost', 1)) |
110 |
+ boost_pool = int(ARGUMENTS.get('boost_pool', 0)) |
111 |
+ system_asio= int(ARGUMENTS.get('system_asio', 1)) |
112 |
|
113 |
diff --git a/sys-cluster/galera/galera-25.3.26.ebuild b/sys-cluster/galera/galera-25.3.26.ebuild |
114 |
new file mode 100644 |
115 |
index 00000000000..cb0e1891730 |
116 |
--- /dev/null |
117 |
+++ b/sys-cluster/galera/galera-25.3.26.ebuild |
118 |
@@ -0,0 +1,89 @@ |
119 |
+# Copyright 1999-2019 Gentoo Authors |
120 |
+# Distributed under the terms of the GNU General Public License v2 |
121 |
+ |
122 |
+EAPI=7 |
123 |
+ |
124 |
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) |
125 |
+ |
126 |
+MY_P="${PN}-3-${PV}" |
127 |
+ |
128 |
+inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic |
129 |
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API" |
130 |
+HOMEPAGE="http://galeracluster.com" |
131 |
+SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.14/${P}/src/${P}.tar.gz" |
132 |
+LICENSE="GPL-2 BSD" |
133 |
+ |
134 |
+SLOT="0" |
135 |
+ |
136 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" |
137 |
+IUSE="cpu_flags_x86_sse4_2 garbd test" |
138 |
+ |
139 |
+CDEPEND=" |
140 |
+ dev-libs/openssl:0= |
141 |
+ >=dev-libs/boost-1.41:0= |
142 |
+ " |
143 |
+BDEPEND=">=sys-devel/gcc-4.4" |
144 |
+DEPEND="${BDEPEND} |
145 |
+ ${CDEPEND} |
146 |
+ dev-libs/check |
147 |
+ >=dev-cpp/asio-1.10.1[ssl] |
148 |
+ <dev-cpp/asio-1.12.0 |
149 |
+ " |
150 |
+#Run time only |
151 |
+RDEPEND="${CDEPEND}" |
152 |
+ |
153 |
+#S="${WORKDIR}/${MY_P}" |
154 |
+# Respect {C,LD}FLAGS. |
155 |
+PATCHES=( "${FILESDIR}/galera-4.1-strip-extra-cflags.patch" ) |
156 |
+ |
157 |
+pkg_preinst() { |
158 |
+ if use garbd ; then |
159 |
+ enewgroup garbd |
160 |
+ enewuser garbd -1 -1 -1 garbd |
161 |
+ fi |
162 |
+} |
163 |
+ |
164 |
+src_prepare() { |
165 |
+ default |
166 |
+ |
167 |
+ # Remove bundled dev-cpp/asio |
168 |
+ rm -r "${S}/asio" || die |
169 |
+ |
170 |
+ #Remove optional garbd daemon |
171 |
+ if ! use garbd ; then |
172 |
+ rm -r "${S}/garb" || die |
173 |
+ fi |
174 |
+} |
175 |
+ |
176 |
+src_configure() { |
177 |
+ tc-export CC CXX |
178 |
+ # Uses hardware specific code that seems to depend on SSE4.2 |
179 |
+ if use cpu_flags_x86_sse4_2 ; then |
180 |
+ append-cflags -msse4.2 |
181 |
+ else |
182 |
+ append-cflags -DCRC32C_NO_HARDWARE |
183 |
+ fi |
184 |
+ # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++, |
185 |
+ # and -Wold-style-cast |
186 |
+ MYSCONS=( |
187 |
+ tests=$(usex test 1 0) |
188 |
+ strict_build_flags=0 |
189 |
+ system_asio=1 |
190 |
+ ) |
191 |
+} |
192 |
+ |
193 |
+src_compile() { |
194 |
+ escons --warn=no-missing-sconscript "${MYSCONS[@]}" |
195 |
+} |
196 |
+ |
197 |
+src_install() { |
198 |
+ dodoc scripts/packages/README scripts/packages/README-MySQL |
199 |
+ if use garbd ; then |
200 |
+ dobin garb/garbd |
201 |
+ newconfd "${FILESDIR}/garb.cnf" garbd |
202 |
+ newinitd "${FILESDIR}/garb.sh" garbd |
203 |
+ doman man/garbd.8 |
204 |
+ fi |
205 |
+ exeinto /usr/$(get_libdir)/${PN} |
206 |
+ doexe libgalera_smm.so |
207 |
+} |