commit: 5ca6d59b0063b7e8f8fabe8772d81c99a59a18ff Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Thu Oct 29 13:13:32 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Thu Oct 29 16:46:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca6d59b
sys-cluster/galera: bump to v26.4.6 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> sys-cluster/galera/Manifest | 1 + .../files/galera-26.4.6-strip-extra-cflags.patch | 38 ++++++++++ sys-cluster/galera/galera-26.4.6.ebuild | 88 ++++++++++++++++++++++ 3 files changed, 127 insertions(+) diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest index c2349925463..8bc9a834075 100644 --- a/sys-cluster/galera/Manifest +++ b/sys-cluster/galera/Manifest @@ -5,3 +5,4 @@ DIST galera-26.4.3.tar.gz 3507925 BLAKE2B fb15724dd1477cbabffe6d76e6fee0425a86d3 DIST galera-26.4.4.tar.gz 3472392 BLAKE2B 146355ad95058d08800870be1c7d1d0be84d2cc621cc7857754468256cfa7ff5c99b98dfab71ea8354f6fdd720ac3a0849f768cf9cc75a55a92e8cdc0a19a9d4 SHA512 4e85b7e5182a04983d1b6f2ea539bb2fc5e02b73502bcaa1c142e92cd3e43d283570301a433518206885b575932ad5d4d9f72243ed94f6c7245036f24c699d8f DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03 DIST galera-4-26.4.5.tar.gz 3527293 BLAKE2B 2e46a1a76ea512cd644f9df6db380fcf232ef296b4178cb85782ece7e6ec70d281e89aea495167028c6e19d70455aecd272e18d8187123093e438715743a2ba6 SHA512 a8400a2a2d9b378e1e5ab9311b2d174355f9126b3bb81863de57db698bcea7571330e255b0f6d139abc4378c80db898739c856b639142864ce34cd147f255b0f +DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6 SHA512 25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a 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 new file mode 100644 index 00000000000..5f5be7a7a94 --- /dev/null +++ b/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch @@ -0,0 +1,38 @@ +--- a/SConstruct ++++ b/SConstruct +@@ -89,7 +89,7 @@ Commandline Options: + build_target = 'all' + + # Optimization level +-opt_flags = ' -g -O3 -DNDEBUG' ++opt_flags = ' -DNDEBUG' + + # Architecture (defaults to build host type) + compile_arch = '' +@@ -134,26 +134,6 @@ if dbug: + if gcov: + opt_flags = opt_flags + ' --coverage -g' + +-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-26.4.6.ebuild b/sys-cluster/galera/galera-26.4.6.ebuild new file mode 100644 index 00000000000..90fb8616cae --- /dev/null +++ b/sys-cluster/galera/galera-26.4.6.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic + +MY_P="${PN}-4-${PV}" + +DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API" +HOMEPAGE="https://galeracluster.com" +SRC_URI="http://releases.galeracluster.com/galera-4/source/${MY_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.5-respect-toolchain.patch +) + +S="${WORKDIR}/${MY_P}" + +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 + # Uses hardware specific code that seems to depend on SSE4.2 + if use cpu_flags_x86_sse4_2 ; then + append-cflags -msse4.2 + else + append-cflags -DCRC32C_NO_HARDWARE + fi + # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++, + # and -Wold-style-cast + MYSCONS=( + 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 +}