commit: 70f12d124a6dfd2a46b849d3fd5f044272f61ff7
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 02:12:31 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 02:19:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70f12d12
sys-cluster/galera: bump to v25.3.32
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-cluster/galera/Manifest | 1 +
.../files/galera-25.3.32-respect-cflags.patch | 38 ++++++++++
sys-cluster/galera/galera-25.3.32.ebuild | 82 ++++++++++++++++++++++
3 files changed, 121 insertions(+)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index c91018f5e80..137a3ddc15f 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,2 +1,3 @@
DIST galera-25.3.28.tar.gz 3390722 BLAKE2B
4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611
SHA512
8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132
+DIST galera-25.3.32.tar.gz 1277302 BLAKE2B
061e146054e530d8e95139749d345ddf5a94bfd5861fad7e7c3612400e766f80618f79e18434f93bd188ebfe46f103e805f2ba18eeca81dfee34eb4212a9b3d2
SHA512
e9aa97c0d0de61c25bc11181a99ee38e24a6ffe5ed71769b5034ea7f232502f082f2c88ccacbc832ab37c19b8f647b5e2c4f2e67efcd7c6d3e5880c6a95eaa53
DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B
fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6
SHA512
25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a
diff --git a/sys-cluster/galera/files/galera-25.3.32-respect-cflags.patch
b/sys-cluster/galera/files/galera-25.3.32-respect-cflags.patch
new file mode 100644
index 00000000000..94c1f829450
--- /dev/null
+++ b/sys-cluster/galera/files/galera-25.3.32-respect-cflags.patch
@@ -0,0 +1,38 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -88,7 +88,7 @@ Commandline Options:
+ build_target = 'all'
+
+ # Optimization level
+-opt_flags = ' -g -O3 -DNDEBUG'
++opt_flags = ' -DNDEBUG'
+
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -121,26 +121,6 @@ elif debug_lvl == 3:
+ if dbug:
+ opt_flags = opt_flags + ' -DGU_DBUG_ON'
+
+-if sysname == 'sunos':
+- compile_arch = ' -mtune=native'
+-elif x86:
+- if bits == 32:
+- if machine == 'x86_64':
+- compile_arch = ' -mx32'
+- else:
+- compile_arch = ' -m32 -march=i686'
+- if sysname == 'linux':
+- link_arch = ' -Wl,-melf_i386'
+- else:
+- compile_arch = ' -m64'
+- if sysname == 'linux':
+- link_arch = ' -Wl,-melf_x86_64'
+- link_arch = compile_arch + link_arch
+-elif machine == 's390x':
+- compile_arch = ' -mzarch'
+- if bits == 32:
+- compile_arch += ' -m32'
+-
+ boost = int(ARGUMENTS.get('boost', 1))
+ boost_pool = int(ARGUMENTS.get('boost_pool', 0))
+ system_asio= int(ARGUMENTS.get('system_asio', 1))
diff --git a/sys-cluster/galera/galera-25.3.32.ebuild
b/sys-cluster/galera/galera-25.3.32.ebuild
new file mode 100644
index 00000000000..ef8bd5a746c
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.32.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the
wsrep API"
+HOMEPAGE="https://galeracluster.com";
+SRC_URI="https://releases.galeracluster.com/galera-3/source/galera-3-${PV}.tar.gz
-> ${P}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+ dev-libs/openssl:0=
+ >=dev-libs/boost-1.41:0=
+ "
+
+BDEPEND=">=sys-devel/gcc-4.4"
+
+DEPEND="${BDEPEND}
+ ${CDEPEND}
+ dev-libs/check
+ >=dev-cpp/asio-1.10.1[ssl]
+ <dev-cpp/asio-1.12.0
+ "
+
+#Run time only
+RDEPEND="${CDEPEND}"
+
+# Respect {C,LD}FLAGS.
+PATCHES=( "${FILESDIR}"/${PN}-25.3.32-respect-cflags.patch )
+
+S="${WORKDIR}/galera-3-${PV}"
+
+src_prepare() {
+ default
+
+ # Remove bundled dev-cpp/asio
+ rm -r "${S}/asio" || die
+
+ #Remove optional garbd daemon
+ if ! use garbd ; then
+ rm -r "${S}/garb" || die
+ fi
+}
+
+src_configure() {
+ tc-export AR CC CXX OBJDUMP
+
+ # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+ # and -Wold-style-cast
+ MYSCONS=(
+ crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
+ tests=$(usex test 1 0)
+ strict_build_flags=0
+ system_asio=1
+ )
+}
+
+src_compile() {
+ escons --warn=no-missing-sconscript "${MYSCONS[@]}"
+}
+
+src_install() {
+ dodoc scripts/packages/README scripts/packages/README-MySQL
+ if use garbd ; then
+ dobin garb/garbd
+ newconfd "${FILESDIR}/garb.cnf" garbd
+ newinitd "${FILESDIR}/garb.init" garbd
+ doman man/garbd.8
+ fi
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe libgalera_smm.so
+}
