commit: 64f5b910ce6fefed1987112a6bbf1d893bedc26b
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 8 19:13:58 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 8 19:16:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f5b910
sys-cluster/galera: bump to v26.4.8
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-cluster/galera/Manifest | 1 +
.../files/galera-26.4.8-respect-toolchain.patch | 53 ++++++++++++++
sys-cluster/galera/galera-26.4.8.ebuild | 85 ++++++++++++++++++++++
3 files changed, 139 insertions(+)
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index b520f03e823..70f4a1ab797 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,4 +1,5 @@
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-26.4.7.tar.gz 1339462 BLAKE2B
9d8ef6ba9e153de848005195edbd99234f282c4e7bda4ddf42f3d6c99088fc3e57536863eb244bfb90d37dbdb6d0cc71661ee5297e59f2faf666da84ee731975
SHA512
ae9c898756ed6cd180bb7bc6a25e7e6b533e4a15a88d3820a936ca203cb0215aca5840599214d2236013da6759981471b47e0e0759d1ccd24c05b8e3c59f3a8c
+DIST galera-26.4.8.tar.gz 1423256 BLAKE2B
9925207387b1ff5886bc0313fee3257a166fb7ad4cb4a93c508688e32467b5e048a8643d3ca0b2d190fe89883a9c7f450de10f488f1fb24988d62d9ab823bbd4
SHA512
5a99f733e38dffe648df6e313e82cc16066b81341e057e9fe7c7494327cc33db77bb9368d43c80d8b09ce2df95cd9079ad2fc6ff6a6a441a42c55bbf07947661
DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B
fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6
SHA512
25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a
diff --git a/sys-cluster/galera/files/galera-26.4.8-respect-toolchain.patch
b/sys-cluster/galera/files/galera-26.4.8-respect-toolchain.patch
new file mode 100644
index 00000000000..202f5aaefc0
--- /dev/null
+++ b/sys-cluster/galera/files/galera-26.4.8-respect-toolchain.patch
@@ -0,0 +1,53 @@
+--- a/SConscript
++++ b/SConscript
+@@ -47,13 +47,15 @@ def check_executable_exists(command):
+ return retval
+
+ def check_dynamic_symbols(target, source, env):
++ objdump = env['OBJDUMP']
++
+ # Check if objdump exists
+- if check_executable_exists(['objdump', '--version']):
++ if check_executable_exists([objdump, '--version']):
+ print('Skipping dynamic symbols check.')
+ return 0
+
+ # Check that DSO doesn't contain asio-related dynamic symbols
+- if env.Execute(Action(['! objdump -T ' + target[0].abspath + ' | grep
asio'], None)):
++ if env.Execute(Action(['! ' + objdump + ' -T ' + target[0].abspath + ' |
grep asio'], None)):
+ return 1
+ return 0
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -5,6 +5,7 @@
+ # SCons build script to build galera libraries
+ #
+ # How to control the build with environment variables:
++# Set AR to specify archive utility
+ # Set CC to specify C compiler
+ # Set CXX to specify C++ compiler
+ # Set CPPFLAGS to add non-standard include paths and preprocessor macros
+@@ -13,6 +14,7 @@
+ # Set CXXFLAGS to supply C++ compiler options
+ # Set LDFLAGS to *override* linking flags
+ # Set LIBPATH to add non-standard linker paths
++# Set OBJDUMP to specify objdump utility
+ # Set RPATH to add rpaths
+ #
+ # Some useful CPPFLAGS:
+@@ -183,6 +185,13 @@ if cxx != 'default':
+ link = os.getenv('LINK', 'default')
+ if link != 'default':
+ env.Replace(LINK = link)
++ar = os.getenv('AR', 'default')
++if ar != 'default':
++ env.Replace(AR = ar)
++objdump = os.getenv('OBJDUMP', 'default')
++if objdump != 'default':
++ env.Replace(OBJDUMP = objdump)
++
+
+ # Get compiler name/version, CXX may be set to "c++" which may be clang or gcc
+ cc_version = str(read_first_line(env['CC'].split() + ['--version']))
+
diff --git a/sys-cluster/galera/galera-26.4.8.ebuild
b/sys-cluster/galera/galera-26.4.8.ebuild
new file mode 100644
index 00000000000..0c3dafe0453
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.8.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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-4/source/galera-4-${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}-26.4.6-strip-extra-cflags.patch
+ "${FILESDIR}"/${PN}-26.4.8-respect-toolchain.patch
+)
+
+S="${WORKDIR}/galera-4-${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
+}
