summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2021-02-04 18:56:06 +0100
committerThomas Deutschmann <whissi@gentoo.org>2021-02-04 23:28:24 +0100
commit1669e78dac9488bac809b6207d1a95151efada7c (patch)
treec26855e1b7c3f1684ad33124086735489f7e6c17 /sys-cluster/galera
parentdev-db/redis: bump to 6.0.10 (diff)
downloadgentoo-1669e78dac9488bac809b6207d1a95151efada7c.tar.gz
gentoo-1669e78dac9488bac809b6207d1a95151efada7c.tar.bz2
gentoo-1669e78dac9488bac809b6207d1a95151efada7c.zip
sys-cluster/galera: remove unused patches
Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19326 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'sys-cluster/galera')
-rw-r--r--sys-cluster/galera/files/galera-26.4.4-respect-AR.patch12
-rw-r--r--sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch68
-rw-r--r--sys-cluster/galera/files/garb.sh49
3 files changed, 0 insertions, 129 deletions
diff --git a/sys-cluster/galera/files/galera-26.4.4-respect-AR.patch b/sys-cluster/galera/files/galera-26.4.4-respect-AR.patch
deleted file mode 100644
index 972bb9288a6e..000000000000
--- a/sys-cluster/galera/files/galera-26.4.4-respect-AR.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -213,6 +213,9 @@ 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)
-
- # 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/files/galera-26.4.5-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch
deleted file mode 100644
index ac99140b6c96..000000000000
--- a/sys-cluster/galera/files/galera-26.4.5-strip-extra-cflags.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -87,7 +87,7 @@ Commandline Options:
- build_target = 'all'
-
- # Optimization level
--opt_flags = ' -g -O3 -DNDEBUG'
-+opt_flags = ' -DNDEBUG'
-
- # Architecture (defaults to build host type)
- compile_arch = ''
-@@ -133,26 +133,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))
---- a/galerautils/src/SConscript
-+++ b/galerautils/src/SConscript
-@@ -1,4 +1,4 @@
--Import('env', 'x86', 'sysname')
-+Import('env', 'sysname')
-
- libgalerautils_env = env.Clone()
-
-@@ -39,21 +39,6 @@ crc32c_env.Append(CPPFLAGS = ' -DWITH_GALERA')
- crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
- crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
-
--if x86:
-- 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 --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh
deleted file mode 100644
index f03eaffc076a..000000000000
--- a/sys-cluster/galera/files/garb.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- use net
- after mysql
-}
-
-start() {
- ebegin "Starting ${SVCNAME}"
-
- if [ -z "${GALERA_NODES}" ]; then
- eerror "List of GALERA_NODES is not configured"
- return 1
- fi
-
- if [ -z "${GALERA_GROUP}" ]; then
- eerror "GALERA_GROUP name is not configured"
- return 1
- fi
-
- GALERA_PORT="${GALERA_PORT:-4567}"
-
- OPTIONS="-a gcomm://${GALERA_NODES// /,} -g ${GALERA_GROUP}"
- [ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}"
- [ -n "${LOG_FILE}" ] && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
- [ -n "${NODE_NAME}" ] && OPTIONS="${OPTIONS} -n ${NODE_NAME}"
-
- start-stop-daemon \
- --start \
- --exec /usr/bin/garbd \
- --pidfile "${PIDFILE}" \
- --make-pidfile \
- --user garbd \
- --group garbd \
- --background \
- -- ${OPTIONS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon \
- --stop \
- --exec /usr/bin/garbd \
- --pidfile "${PIDFILE}"
- eend $?
-}