mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sys-cluster/galera: drop 26.4.13-r1, 26.4.14, 26.4.15
Closes: https://bugs.gentoo.org/640618 Closes: https://bugs.gentoo.org/775236 Closes: https://bugs.gentoo.org/806348 Closes: https://bugs.gentoo.org/922984 Signed-off-by: Petr Vaněk <arkamar@gentoo.org>
This commit is contained in:
@@ -1,5 +1,2 @@
|
||||
DIST galera-26.4.13.tar.gz 1529682 BLAKE2B d7030fd5e3a48ede16f608cca9986de117a54f99cf3d972a5b14623acd84f05f31f5cdbbc3032bf5caa8e0486f418ac07c8f87287bb14a8164507c558876ae61 SHA512 e548048eac5fceb0bea1ae736abc6c488d175bc71a3cfb963675232688392ecb5dcc64ddd8e78ceda40e26b94b806d3c34bd9fc9765ebc047b5a5ce28ff7efea
|
||||
DIST galera-26.4.14.tar.gz 1532285 BLAKE2B c647332a1a70609fbe3197653df2e24ccd0c5e053b1c9ef4d3de20bc70d8f2363090c6296e9e81eeb92a625c85d67b4f298db8e34862c7deb907baf13bae2e45 SHA512 f9bb3d1d503ed7f90cfc5596e68e8cf77683d2d7e6ddb45d0a6618bbc6a31ad2caa80933f6724734ec4ae416b37d7d7ec61e1bf0b87cefd4c959954266a2fb26
|
||||
DIST galera-26.4.15.tar.gz 1532571 BLAKE2B 8aa5c6027b4cfe7f41c9d431315a4a12b9ea45896743bafa296470e8e3f0613e8974e3daea0d7c89c3e2d014692fb7d10f4a64588add569a197546dcd0f0108d SHA512 b866610c00df344ea8c9cc948fadfa4be808ee6bb100fec470dee006458d81ec704db156d320889610bff9b944023963f624b8672596a282c7658c55d99ffca6
|
||||
DIST galera-26.4.17.tar.gz 1541975 BLAKE2B 7b12a9c056e45fc0614910a5f6eb1127e3613aa7b212db94594330ddd048de4982cbb1d36a75c08da0aa31a9a08a5632686e867b967291bb269835e37a6efcb3 SHA512 c11fecb6c9e142643f594275d6ff486d7a3615016691373831e57221f9bbfdc086202757068a2cc9308049b3499aa64dcc6f066dcf6437d25a4c546b19ac8fa3
|
||||
DIST galera-26.4.18.tar.gz 1542330 BLAKE2B 5a0d8b1929a72ce36f521ba3404b9251503226ba041970bc67f9d25b2b55c2daa2128500117366273541578eb1d7fd213d5f8336cba705650c55b70125dcbf0d SHA512 75ae75c0bac1b2ba5d0230af9b0e14b5e8661f20f84cee3800b2e979c3ef53c9dd5ce8cebcec1ae9205b5dec28f94f690854cce32a10e9f58d8aa55725fd59c6
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index ce955fc..3ff241a 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -325,7 +325,7 @@ def CheckSystemASIOVersion(context):
|
||||
#pragma message "Asio version:" XSTR(ASIO_VERSION)
|
||||
#if ASIO_VERSION < 101008
|
||||
#error Included asio version is too old
|
||||
-#elif ASIO_VERSION >= 101100
|
||||
+#elif ASIO_VERSION >= 102600
|
||||
#error Included asio version is too new
|
||||
#endif
|
||||
|
||||
@@ -335,7 +335,7 @@ int main()
|
||||
}
|
||||
|
||||
"""
|
||||
- context.Message('Checking ASIO version (>= 1.10.8 and < 1.11.0) ... ')
|
||||
+ context.Message('Checking ASIO version (>= 1.10.8 and < 1.26.0) ... ')
|
||||
result = context.TryLink(system_asio_test_source_file, '.cpp')
|
||||
context.Result(result)
|
||||
return result
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/wsrep/tests/wsrep_loader_test.c b/wsrep/tests/wsrep_loader_test.c
|
||||
index 47f4db2..8e349c8 100644
|
||||
--- a/wsrep/tests/wsrep_loader_test.c
|
||||
+++ b/wsrep/tests/wsrep_loader_test.c
|
||||
@@ -48,7 +48,7 @@ int wsrep_load_unload()
|
||||
{
|
||||
fprintf(stderr, "Provider version string '%s' not expected '%s'\n",
|
||||
wsrep->provider_version, expected_version);
|
||||
- abort();
|
||||
+ //abort();
|
||||
}
|
||||
wsrep_unload(wsrep);
|
||||
return 0;
|
||||
@@ -1,38 +0,0 @@
|
||||
--- 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))
|
||||
@@ -1,53 +0,0 @@
|
||||
--- 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']))
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{9..11} )
|
||||
|
||||
inherit python-any-r1 scons-utils toolchain-funcs
|
||||
|
||||
MY_PN="${PN}-4"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
|
||||
DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
|
||||
HOMEPAGE="https://galeracluster.com"
|
||||
SRC_URI="
|
||||
https://releases.galeracluster.com/${MY_PN}.$(ver_cut 3)/source/${MY_P}.tar.gz
|
||||
-> ${P}.tar.gz
|
||||
"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
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 )"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/openssl:=
|
||||
dev-libs/boost:=
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
dev-libs/check
|
||||
>=dev-cpp/asio-1.22
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
|
||||
"${FILESDIR}"/${PN}-26.4.8-respect-toolchain.patch
|
||||
"${FILESDIR}"/${PN}-26.4.13-asio.patch
|
||||
"${FILESDIR}"/${PN}-26.4.13-tests.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Remove bundled dev-cpp/asio
|
||||
rm -r asio || die "Failed to remove bundled asio"
|
||||
|
||||
# Remove optional garbd daemon
|
||||
if ! use garbd ; then
|
||||
rm -r garb || die "Failed to remove garbd daemon"
|
||||
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)/galera
|
||||
doexe libgalera_smm.so
|
||||
}
|
||||
@@ -1,85 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{9..11} )
|
||||
|
||||
inherit python-any-r1 scons-utils toolchain-funcs
|
||||
|
||||
MY_PN="${PN}-4"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
|
||||
DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
|
||||
HOMEPAGE="https://galeracluster.com"
|
||||
SRC_URI="
|
||||
https://releases.galeracluster.com/${MY_PN}.$(ver_cut 3)/source/${MY_P}.tar.gz
|
||||
-> ${P}.tar.gz
|
||||
"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
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 )"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/openssl:=
|
||||
dev-libs/boost:=
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
dev-libs/check
|
||||
>=dev-cpp/asio-1.22
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
|
||||
"${FILESDIR}"/${PN}-26.4.8-respect-toolchain.patch
|
||||
"${FILESDIR}"/${PN}-26.4.13-asio.patch
|
||||
"${FILESDIR}"/${PN}-26.4.13-tests.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Remove bundled dev-cpp/asio
|
||||
rm -r asio || die "Failed to remove bundled asio"
|
||||
|
||||
# Remove optional garbd daemon
|
||||
if ! use garbd ; then
|
||||
rm -r garb || die "Failed to remove garbd daemon"
|
||||
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)/galera
|
||||
doexe libgalera_smm.so
|
||||
}
|
||||
@@ -1,71 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake
|
||||
|
||||
MY_PN="${PN}-4"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
|
||||
DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
|
||||
HOMEPAGE="https://galeracluster.com"
|
||||
SRC_URI="
|
||||
https://releases.galeracluster.com/${MY_PN}.$(ver_cut 3)/source/${MY_P}.tar.gz
|
||||
-> ${P}.tar.gz
|
||||
"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
LICENSE="GPL-2 BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~x86"
|
||||
IUSE="garbd ssl"
|
||||
|
||||
RDEPEND="
|
||||
ssl? ( dev-libs/openssl:= )
|
||||
dev-libs/boost:=
|
||||
"
|
||||
# TODO: Make check dep optional
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=dev-cpp/asio-1.22
|
||||
dev-libs/check
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
# Remove bundled dev-cpp/asio
|
||||
rm -r asio || die "Failed to remove bundled asio"
|
||||
|
||||
# Remove optional garbd daemon
|
||||
if ! use garbd ; then
|
||||
rm -r garb || die "Failed to remove garbd daemon"
|
||||
sed -i '/add_subdirectory(garb)/d' CMakeLists.txt || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DGALERA_WITH_SSL=$(usex ssl)
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodoc scripts/packages/README scripts/packages/README-MySQL
|
||||
|
||||
if use garbd ; then
|
||||
newconfd "${FILESDIR}"/garb.cnf garbd
|
||||
newinitd "${FILESDIR}"/garb.init garbd
|
||||
doman man/garbd.8
|
||||
|
||||
pushd "${BUILD_DIR}" || die
|
||||
dobin garb/garbd
|
||||
fi
|
||||
|
||||
pushd "${BUILD_DIR}" || die
|
||||
exeinto /usr/$(get_libdir)/galera
|
||||
doexe libgalera_smm.so
|
||||
}
|
||||
Reference in New Issue
Block a user