summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-cluster/galera/files')
-rw-r--r--sys-cluster/galera/files/disable-tests-23.2.7.patch76
-rw-r--r--sys-cluster/galera/files/garb.cnf17
-rw-r--r--sys-cluster/galera/files/garb.sh63
-rw-r--r--sys-cluster/galera/files/respect-flags.patch35
4 files changed, 0 insertions, 191 deletions
diff --git a/sys-cluster/galera/files/disable-tests-23.2.7.patch b/sys-cluster/galera/files/disable-tests-23.2.7.patch
deleted file mode 100644
index fd6c0a0..0000000
--- a/sys-cluster/galera/files/disable-tests-23.2.7.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -aurN a/galera/SConstruct b/galera/SConstruct
---- a/galera/SConstruct 2013-10-16 10:08:43.057673018 -0400
-+++ b/galera/SConstruct 2013-10-16 10:10:04.687494314 -0400
-@@ -407,19 +407,20 @@
- # Clone base from default environment
- check_env = env.Clone()
-
--conf = Configure(check_env)
-+if tests == 1:
-+ conf = Configure(check_env)
-
- # Check header and library
-
--if not conf.CheckHeader('check.h'):
-- print 'Error: check header file not found or not usable'
-- Exit(1)
--
--if not conf.CheckLib('check'):
-- print 'Error: check library not found or not usable'
-- Exit(1)
-+ if not conf.CheckHeader('check.h'):
-+ print 'Error: check header file not found or not usable'
-+ Exit(1)
-+
-+ if not conf.CheckLib('check'):
-+ print 'Error: check library not found or not usable'
-+ Exit(1)
-
--conf.Finish()
-+ conf.Finish()
-
- # Note: Don't do this, glibc does not like static linking
- # Link unit tests statically
-diff -aurN a/galera/SConscript b/galera/SConscript
---- a/galera/SConscript 2013-03-11 02:44:50.000000000 -0400
-+++ b/galera/SConscript 2013-05-13 13:13:20.851827437 -0400
-@@ -1,2 +1,2 @@
-
--SConscript(['src/SConscript', 'tests/SConscript'])
-+SConscript(['src/SConscript'])
-diff -aurN a/galerautils/SConscript b/galerautils/SConscript
---- a/galerautils/SConscript 2013-03-11 02:44:50.000000000 -0400
-+++ b/galerautils/SConscript 2013-05-13 13:15:37.010071765 -0400
-@@ -1,3 +1,3 @@
- # SConscript for building galerautils
-
--SConscript(Split('''src/SConscript tests/SConscript'''))
-+SConscript(Split('''src/SConscript'''))
-diff -aurN a/gcache/SConscript b/gcache/SConscript
---- a/gcache/SConscript 2013-03-11 02:44:50.000000000 -0400
-+++ b/gcache/SConscript 2013-05-13 13:15:55.179837389 -0400
-@@ -1,3 +1,3 @@
- # SConscript for building galerautils
-
--SConscript(Split('''src/SConscript tests/SConscript'''))
-+SConscript(Split('''src/SConscript'''))
-diff -aurN a/gcomm/SConscript b/gcomm/SConscript
---- a/gcomm/SConscript 2013-03-11 02:44:50.000000000 -0400
-+++ b/gcomm/SConscript 2013-05-13 13:16:08.979659369 -0400
-@@ -1,3 +1,3 @@
- # SCons build script for building gcomm
-
--SConscript(Split('''src/SConscript test/SConscript'''))
-+SConscript(Split('''src/SConscript'''))
-diff -aurN a/gcs/src/SConscript b/gcs/src/SConscript
---- a/gcs/src/SConscript 2013-03-11 02:44:50.000000000 -0400
-+++ b/gcs/src/SConscript 2013-05-13 13:12:53.122184848 -0400
-@@ -46,8 +46,6 @@
- source = 'gcs_test.c',
- LINK = libgcs_env['CXX'])
-
--SConscript('unit_tests/SConscript')
--
- #
- env.Append(LIBGALERA_OBJS = libgcs_env.SharedObject(libgcs_sources))
-
diff --git a/sys-cluster/galera/files/garb.cnf b/sys-cluster/galera/files/garb.cnf
deleted file mode 100644
index 4f0047a..0000000
--- a/sys-cluster/galera/files/garb.cnf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (C) 2012 Coedership Oy
-# This config file is to be sourced by garbd service script.
-
-# A space-separated list of node addresses (address[:port]) in the cluster
-# GALERA_NODES=""
-
-# Galera cluster name, should be the same as on the rest of the nodes.
-# GALERA_GROUP=""
-
-# Optional Galera internal options string (e.g. SSL settings)
-# see http://www.codership.com/wiki/doku.php?id=galera_parameters
-# GALERA_OPTIONS=""
-
-# Log file for garbd. Optional, by default logs to syslog
-# LOG_FILE=""
-
-PIDFILE=/var/run/garbd
diff --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh
deleted file mode 100644
index 63e88df..0000000
--- a/sys-cluster/galera/files/garb.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 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}"
-
- for ADDRESS in ${GALERA_NODES} 0; do
- HOST=$(echo $ADDRESS | cut -d \: -f 1 )
- PORT=$(echo $ADDRESS | cut -d \: -f 2 )
- if [ "x${HOST}" = "x${PORT}" ]; then
- PORT=${GALERA_PORT}
- fi
- PORT=${PORT:-$GALERA_PORT}
- nc -z ${HOST} ${PORT} > /dev/null && break
- done
- if [ ${ADDRESS} = "0" ]; then
- eerror "None of the nodes in GALERA_NODES is accessible"
- return 1
- fi
-
- OPTIONS="-a gcomm://${ADDRESS} -g ${GALERA_GROUP}"
- [ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}"
- [ -n "${LOG_FILE}" ] && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
-
- 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 $?
-}
-
diff --git a/sys-cluster/galera/files/respect-flags.patch b/sys-cluster/galera/files/respect-flags.patch
deleted file mode 100644
index d7e5f37..0000000
--- a/sys-cluster/galera/files/respect-flags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/SConstruct 2014-03-07 14:27:26.797904671 -0500
-+++ b/SConstruct 2014-03-07 14:31:18.672478115 -0500
-@@ -49,7 +49,7 @@
- build_target = 'all'
-
- # Optimization level
--opt_flags = ' -g -O3 -DNDEBUG'
-+opt_flags = ' -DNDEBUG'
-
- # Architecture (defaults to build host type)
- compile_arch = ''
-@@ -214,12 +214,12 @@
- ' -Wall -Wextra -Wno-unused-parameter')
-
- # C-specific flags
--env.Replace(CFLAGS = ' -std=c99 -fno-strict-aliasing -pipe')
-+env.Replace(CFLAGS = os.getenv('CFLAGS','') + ' -std=c99 -fno-strict-aliasing -pipe')
-
- # CXX-specific flags
- # Note: not all 3rd-party libs like '-Wold-style-cast -Weffc++'
- # adding those after checks
--env.Replace(CXXFLAGS = ' -Wno-long-long -Wno-deprecated -ansi')
-+env.Replace(CXXFLAGS = os.getenv('CXXFLAGS','') + ' -Wno-long-long -Wno-deprecated -ansi')
- if sysname != 'sunos':
- env.Append(CXXFLAGS = ' -pipe')
-
-@@ -228,7 +228,7 @@
- # TODO: enable '-Wl,--warn-common -Wl,--fatal-warnings' after warnings from
- # static linking have beed addressed
- #
--env.Append(LINKFLAGS = link_arch)
-+env.Append(LINKFLAGS = link_arch + ' ' + os.getenv('LDFLAGS',''))
-
- #
- # Check required headers and libraries (autoconf functionality)