diff options
Diffstat (limited to 'sys-cluster/galera')
-rw-r--r-- | sys-cluster/galera/Manifest | 7 | ||||
-rw-r--r-- | sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch | 78 | ||||
-rw-r--r-- | sys-cluster/galera/galera-25.3.23.ebuild | 87 | ||||
-rw-r--r-- | sys-cluster/galera/galera-25.3.26.ebuild (renamed from sys-cluster/galera/galera-25.3.24.ebuild) | 18 |
4 files changed, 91 insertions, 99 deletions
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest index 5ac50540745f..ff67ab69d36b 100644 --- a/sys-cluster/galera/Manifest +++ b/sys-cluster/galera/Manifest @@ -1,10 +1,9 @@ AUX galera-3.15-strip-extra-cflags.patch 2397 BLAKE2B 7d1d9e7b775e8ee26da152fb42c4b19e65e1084e471d4c7613a661206ee05fa280c29266be4ae66c0b1001de3062a6396c3b45917fcf3d4090b8afe229a7e680 SHA512 4f41398faaa138543ff6fd24b2aac9aa329dabf74d6355ea5c620db64e3112e27e17c15bf7e1dae1e7ddbe92795cedd65a9d6e52bd07b66f3fe27dde2ffc7cad +AUX galera-4.1-strip-extra-cflags.patch 2747 BLAKE2B 314e020bdbce2d3080d28c4d5bf5ad438affc8075736c38b77d713e59749a4eabce3a38b6c918b1768f48b99ec5c860813c3441291d0834ebf6d6ed545d30576 SHA512 0458705897861d4bc225326077ae379fb1c921aa65a102a24f2fba5c866c52a549c47bed929801c06ebb0c484136c1179a56b2fd750abd6aabc7a6a74fc18c2f AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c3b5f18dca3cfbe6a4a115c324c945f6949e8fe227b8b9e4e94816d48eda53e9e2723100e5 SHA512 97b921109b242ad1a19326564b5f9da8a09eadd4771c2c86c727c1c30e35f92ffadbb38ce7d81bc88572d2c7b04466ad212432954e09d81417c4ed7f69ec4648 AUX garb.sh 1029 BLAKE2B 452a4f3bf50b25f040784e03d428ba10a3580cee486a5cb283db90bee4bcefe951813fbfd4e38024fb05d1681adb74a697dfe48c4d0c47aaddf094204a818a95 SHA512 780eb8e7584d31ce24559e46724c7b981320f4706af0b9f0cd8d157247f853f51d3980178d0d234f64bcb097a4ee5493fe299d6800513403dbc7e0184c020902 -DIST galera-3-25.3.23.tar.gz 3328961 BLAKE2B d11c6d00fda367fc961a5387865afa74e1ed0ed04094a4ab3c5ab23c7a915131b867a85f74079dc472df745762346b8b9fd371d5d0d0406e20274d51917129b5 SHA512 5b6a61ddd1505f9e2f9e3c592d65e17ee55ee78187d423f8f963d9c7b8deed2c1ade3425262d0a89622693853dff95d429861c955b2d051433dda8929d9f92d1 -DIST galera-3-25.3.24.tar.gz 3373375 BLAKE2B db837add9d74e2acb312bd974f00b52d269f1c5995036b468f309da43605b817fac16f17c30e96c27e17657708870d329b41eafa9ad214d8cb5f1b4fbb468182 SHA512 874c6ee77be54a0bcd6d36b67f8e99d12dabd85433dd1f0e026b7994746679cc7ffebcf721445dfd1714f89c7594fc0b0137e725d220d3bb45fd325e64e16185 +DIST galera-25.3.26.tar.gz 3386588 BLAKE2B ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4 SHA512 c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03 -EBUILD galera-25.3.23.ebuild 1834 BLAKE2B c9c0ce726168b44adebd8a862f0446865e9acfb22dee871c322a60c3a2bbd1b1e02fc363ed2840f09cad7f7ca984128319fb49fab2470e5dee97586f8d2b51de SHA512 f5389646c9d5ef832a430440e31c27e99488352a645657a2044f4739c45ef185207e0a3466a35b731b68a9d53c362b28ca4aa9ef91e403a506ee1a435e1a1aae -EBUILD galera-25.3.24.ebuild 1838 BLAKE2B 0803ea202f990158eb9b9dd2f8b019885c71d24337543bb465d36f498bdaf8444275b0d0e45dafd182b69ada8d2e530701fbb32377f909c257d81fd9212bf4e9 SHA512 d1a86a5aee5cf7087cd76af06764274dde519494da74367e5068bc5b2e530dda33e2869a8755ea327a3615d7ad87cb8973118f25c523fa2183ff1f01d06b06f7 EBUILD galera-25.3.25.ebuild 1898 BLAKE2B 233d5916fa1859a43ac111ecc8ae5051851a30527a8e635880a0fefe2bec46a3415164b01faeb9808ee2b23909febf2750b8603de0b3c201e5b70393316f1868 SHA512 965e5874a357095dd6b410eb2aaa6d8bb20c11b636a40a1276dc2009a536a3cb6745a1ad6c76bbff19b2b6707f45743699716fe1104c8be471ca1e770807638f +EBUILD galera-25.3.26.ebuild 1913 BLAKE2B 928d84e64eaf0691173b9ebe663c66d2b91635ef818bb12bac0b720393686d0500727226fb99e8e02568feb39ed91964029d278fdcda7389c072194af8eb713c SHA512 c17cac0dd0c4f8c5e7915c20dcc81db99651acb93edf65858947478f3a52f1668ac880180519600a85cc2f296c3e17b92d2f316a2d4ad3283d169bff711037ed MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2 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 new file mode 100644 index 000000000000..dfa1642c7d7e --- /dev/null +++ b/sys-cluster/galera/files/galera-4.1-strip-extra-cflags.patch @@ -0,0 +1,78 @@ +diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript +--- a/galerautils/src/SConscript 2019-02-25 10:37:25.000000000 -0500 ++++ b/galerautils/src/SConscript 2019-03-07 09:51:27.163226469 -0500 +@@ -1,4 +1,4 @@ +-Import('env', 'x86', 'sysname', 'machine') ++Import('env', 'sysname', 'machine') + + libgalerautils_env = env.Clone() + +@@ -39,22 +39,6 @@ + crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ] + crc32c_objs = crc32c_env.SharedObject(crc32c_sources) + +-if x86: +- if machine != 'ppc64' and machine != 'ppc64le': +- crc32c_env.Append(CFLAGS = ' -msse4.2') +- if sysname == 'sunos': +- # Ideally we want to simply strip SSE4.2 flag from the resulting +- # crc32.pic.o +- # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html) +- # but that requires some serious scons-fu, so we just don't +- # compile hardware support in if host CPU does not have it. +- from subprocess import check_call +- try: +- check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True); +- except: +- libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE') +- crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE') +- + libgalerautils_env.StaticLibrary('galerautils', + libgalerautils_objs + crc32c_objs) + +diff -aurN a/SConstruct b/SConstruct +--- a/SConstruct 2019-03-07 09:44:38.588841625 -0500 ++++ b/SConstruct 2019-03-07 09:50:06.305952407 -0500 +@@ -67,7 +67,7 @@ + build_target = 'all' + + # Optimization level +-opt_flags = ' -g -O3 -DNDEBUG' ++opt_flags = ' -DNDEBUG' + + # Architecture (defaults to build host type) + compile_arch = '' +@@ -120,33 +120,6 @@ + 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: +- if machine == 'ppc64': +- compile_arch = ' -mtune=native' +- link_arch = ' -Wl,-melf64ppc' +- elif machine == 'ppc64le': +- compile_arch = ' -mtune=native' +- link_arch = ' -Wl,-melf64lppc' +- 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.23.ebuild b/sys-cluster/galera/galera-25.3.23.ebuild deleted file mode 100644 index bcb3d49b1677..000000000000 --- a/sys-cluster/galera/galera-25.3.23.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${PN}-3-${PV}" - -inherit scons-utils toolchain-funcs user flag-o-matic -DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API" -HOMEPAGE="http://galeracluster.com" -SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz" -LICENSE="GPL-2 BSD" - -SLOT="0" - -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86" -IUSE="cpu_flags_x86_sse4_2 garbd test" - -CDEPEND=" - dev-libs/openssl:0= - >=dev-libs/boost-1.41:0= - " -DEPEND="${DEPEND} - ${CDEPEND} - dev-libs/check - >=sys-devel/gcc-4.4 - >=dev-cpp/asio-1.10.1[ssl] - <dev-cpp/asio-1.12.0 - " -#Run time only -RDEPEND="${CDEPEND}" - -S="${WORKDIR}/${MY_P}" -# Respect {C,LD}FLAGS. -PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" ) - -pkg_preinst() { - if use garbd ; then - enewgroup garbd - enewuser garbd -1 -1 -1 garbd - fi -} - -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 CC CXX - # 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.sh" garbd - doman man/garbd.8 - fi - exeinto /usr/$(get_libdir)/${PN} - doexe libgalera_smm.so -} diff --git a/sys-cluster/galera/galera-25.3.24.ebuild b/sys-cluster/galera/galera-25.3.26.ebuild index b86933238352..cb0e18917305 100644 --- a/sys-cluster/galera/galera-25.3.24.ebuild +++ b/sys-cluster/galera/galera-25.3.26.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) MY_P="${PN}-3-${PV}" -inherit scons-utils toolchain-funcs user flag-o-matic +inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API" HOMEPAGE="http://galeracluster.com" -SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz" +SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.14/${P}/src/${P}.tar.gz" LICENSE="GPL-2 BSD" SLOT="0" @@ -20,19 +22,19 @@ CDEPEND=" dev-libs/openssl:0= >=dev-libs/boost-1.41:0= " -DEPEND="${DEPEND} +BDEPEND=">=sys-devel/gcc-4.4" +DEPEND="${BDEPEND} ${CDEPEND} dev-libs/check - >=sys-devel/gcc-4.4 >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0 " #Run time only RDEPEND="${CDEPEND}" -S="${WORKDIR}/${MY_P}" +#S="${WORKDIR}/${MY_P}" # Respect {C,LD}FLAGS. -PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" ) +PATCHES=( "${FILESDIR}/galera-4.1-strip-extra-cflags.patch" ) pkg_preinst() { if use garbd ; then |