1 |
commit: 5ca6d59b0063b7e8f8fabe8772d81c99a59a18ff |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 29 13:13:32 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 29 16:46:52 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca6d59b |
7 |
|
8 |
sys-cluster/galera: bump to v26.4.6 |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
12 |
|
13 |
sys-cluster/galera/Manifest | 1 + |
14 |
.../files/galera-26.4.6-strip-extra-cflags.patch | 38 ++++++++++ |
15 |
sys-cluster/galera/galera-26.4.6.ebuild | 88 ++++++++++++++++++++++ |
16 |
3 files changed, 127 insertions(+) |
17 |
|
18 |
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest |
19 |
index c2349925463..8bc9a834075 100644 |
20 |
--- a/sys-cluster/galera/Manifest |
21 |
+++ b/sys-cluster/galera/Manifest |
22 |
@@ -5,3 +5,4 @@ DIST galera-26.4.3.tar.gz 3507925 BLAKE2B fb15724dd1477cbabffe6d76e6fee0425a86d3 |
23 |
DIST galera-26.4.4.tar.gz 3472392 BLAKE2B 146355ad95058d08800870be1c7d1d0be84d2cc621cc7857754468256cfa7ff5c99b98dfab71ea8354f6fdd720ac3a0849f768cf9cc75a55a92e8cdc0a19a9d4 SHA512 4e85b7e5182a04983d1b6f2ea539bb2fc5e02b73502bcaa1c142e92cd3e43d283570301a433518206885b575932ad5d4d9f72243ed94f6c7245036f24c699d8f |
24 |
DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03 |
25 |
DIST galera-4-26.4.5.tar.gz 3527293 BLAKE2B 2e46a1a76ea512cd644f9df6db380fcf232ef296b4178cb85782ece7e6ec70d281e89aea495167028c6e19d70455aecd272e18d8187123093e438715743a2ba6 SHA512 a8400a2a2d9b378e1e5ab9311b2d174355f9126b3bb81863de57db698bcea7571330e255b0f6d139abc4378c80db898739c856b639142864ce34cd147f255b0f |
26 |
+DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6 SHA512 25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a |
27 |
|
28 |
diff --git a/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch |
29 |
new file mode 100644 |
30 |
index 00000000000..5f5be7a7a94 |
31 |
--- /dev/null |
32 |
+++ b/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch |
33 |
@@ -0,0 +1,38 @@ |
34 |
+--- a/SConstruct |
35 |
++++ b/SConstruct |
36 |
+@@ -89,7 +89,7 @@ Commandline Options: |
37 |
+ build_target = 'all' |
38 |
+ |
39 |
+ # Optimization level |
40 |
+-opt_flags = ' -g -O3 -DNDEBUG' |
41 |
++opt_flags = ' -DNDEBUG' |
42 |
+ |
43 |
+ # Architecture (defaults to build host type) |
44 |
+ compile_arch = '' |
45 |
+@@ -134,26 +134,6 @@ if dbug: |
46 |
+ if gcov: |
47 |
+ opt_flags = opt_flags + ' --coverage -g' |
48 |
+ |
49 |
+-if sysname == 'sunos': |
50 |
+- compile_arch = ' -mtune=native' |
51 |
+-elif x86: |
52 |
+- if bits == 32: |
53 |
+- if machine == 'x86_64': |
54 |
+- compile_arch = ' -mx32' |
55 |
+- else: |
56 |
+- compile_arch = ' -m32 -march=i686' |
57 |
+- if sysname == 'linux': |
58 |
+- link_arch = ' -Wl,-melf_i386' |
59 |
+- else: |
60 |
+- compile_arch = ' -m64' |
61 |
+- if sysname == 'linux': |
62 |
+- link_arch = ' -Wl,-melf_x86_64' |
63 |
+- link_arch = compile_arch + link_arch |
64 |
+-elif machine == 's390x': |
65 |
+- compile_arch = ' -mzarch' |
66 |
+- if bits == 32: |
67 |
+- compile_arch += ' -m32' |
68 |
+- |
69 |
+ boost = int(ARGUMENTS.get('boost', 1)) |
70 |
+ boost_pool = int(ARGUMENTS.get('boost_pool', 0)) |
71 |
+ system_asio= int(ARGUMENTS.get('system_asio', 1)) |
72 |
|
73 |
diff --git a/sys-cluster/galera/galera-26.4.6.ebuild b/sys-cluster/galera/galera-26.4.6.ebuild |
74 |
new file mode 100644 |
75 |
index 00000000000..90fb8616cae |
76 |
--- /dev/null |
77 |
+++ b/sys-cluster/galera/galera-26.4.6.ebuild |
78 |
@@ -0,0 +1,88 @@ |
79 |
+# Copyright 1999-2020 Gentoo Authors |
80 |
+# Distributed under the terms of the GNU General Public License v2 |
81 |
+ |
82 |
+EAPI=7 |
83 |
+ |
84 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
85 |
+ |
86 |
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic |
87 |
+ |
88 |
+MY_P="${PN}-4-${PV}" |
89 |
+ |
90 |
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API" |
91 |
+HOMEPAGE="https://galeracluster.com" |
92 |
+SRC_URI="http://releases.galeracluster.com/galera-4/source/${MY_P}.tar.gz" |
93 |
+LICENSE="GPL-2 BSD" |
94 |
+ |
95 |
+SLOT="0" |
96 |
+ |
97 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" |
98 |
+IUSE="cpu_flags_x86_sse4_2 garbd test" |
99 |
+RESTRICT="!test? ( test )" |
100 |
+ |
101 |
+CDEPEND=" |
102 |
+ dev-libs/openssl:0= |
103 |
+ >=dev-libs/boost-1.41:0= |
104 |
+ " |
105 |
+BDEPEND=">=sys-devel/gcc-4.4" |
106 |
+DEPEND="${BDEPEND} |
107 |
+ ${CDEPEND} |
108 |
+ dev-libs/check |
109 |
+ >=dev-cpp/asio-1.10.1[ssl] |
110 |
+ <dev-cpp/asio-1.12.0 |
111 |
+ " |
112 |
+#Run time only |
113 |
+RDEPEND="${CDEPEND}" |
114 |
+ |
115 |
+# Respect {C,LD}FLAGS. |
116 |
+PATCHES=( |
117 |
+ "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch |
118 |
+ "${FILESDIR}"/${PN}-26.4.5-respect-toolchain.patch |
119 |
+) |
120 |
+ |
121 |
+S="${WORKDIR}/${MY_P}" |
122 |
+ |
123 |
+src_prepare() { |
124 |
+ default |
125 |
+ |
126 |
+ # Remove bundled dev-cpp/asio |
127 |
+ rm -r "${S}/asio" || die |
128 |
+ |
129 |
+ #Remove optional garbd daemon |
130 |
+ if ! use garbd ; then |
131 |
+ rm -r "${S}/garb" || die |
132 |
+ fi |
133 |
+} |
134 |
+ |
135 |
+src_configure() { |
136 |
+ tc-export AR CC CXX OBJDUMP |
137 |
+ # Uses hardware specific code that seems to depend on SSE4.2 |
138 |
+ if use cpu_flags_x86_sse4_2 ; then |
139 |
+ append-cflags -msse4.2 |
140 |
+ else |
141 |
+ append-cflags -DCRC32C_NO_HARDWARE |
142 |
+ fi |
143 |
+ # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++, |
144 |
+ # and -Wold-style-cast |
145 |
+ MYSCONS=( |
146 |
+ tests=$(usex test 1 0) |
147 |
+ strict_build_flags=0 |
148 |
+ system_asio=1 |
149 |
+ ) |
150 |
+} |
151 |
+ |
152 |
+src_compile() { |
153 |
+ escons --warn=no-missing-sconscript "${MYSCONS[@]}" |
154 |
+} |
155 |
+ |
156 |
+src_install() { |
157 |
+ dodoc scripts/packages/README scripts/packages/README-MySQL |
158 |
+ if use garbd ; then |
159 |
+ dobin garb/garbd |
160 |
+ newconfd "${FILESDIR}/garb.cnf" garbd |
161 |
+ newinitd "${FILESDIR}/garb.init" garbd |
162 |
+ doman man/garbd.8 |
163 |
+ fi |
164 |
+ exeinto /usr/$(get_libdir)/${PN} |
165 |
+ doexe libgalera_smm.so |
166 |
+} |