summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2016-03-18 10:30:14 -0400
committerBrian Evans <grknight@gentoo.org>2016-03-18 10:30:14 -0400
commit0f878cbde7f6540b3bcbef549ea0e86a022d9816 (patch)
treeb8662ab3140cfc82e3af09abb20e32485b7a3341 /sys-cluster/galera/files
parentsys-cluster/galera: Version bump to 25.3.15 (diff)
downloadgentoo-0f878cbde7f6540b3bcbef549ea0e86a022d9816.tar.gz
gentoo-0f878cbde7f6540b3bcbef549ea0e86a022d9816.tar.bz2
gentoo-0f878cbde7f6540b3bcbef549ea0e86a022d9816.zip
sys-cluster/galera: Drop old versions
Package-Manager: portage-2.2.28
Diffstat (limited to 'sys-cluster/galera/files')
-rw-r--r--sys-cluster/galera/files/disable-tests.patch80
-rw-r--r--sys-cluster/galera/files/galera-3.12-strip-extra-buildconfig.patch21
-rw-r--r--sys-cluster/galera/files/galera-3.12-strip-machine-cflags.patch64
-rw-r--r--sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch70
-rw-r--r--sys-cluster/galera/files/galera-strip-machine-cflags.patch62
-rw-r--r--sys-cluster/galera/files/respect-flags.patch35
6 files changed, 0 insertions, 332 deletions
diff --git a/sys-cluster/galera/files/disable-tests.patch b/sys-cluster/galera/files/disable-tests.patch
deleted file mode 100644
index b82294b32241..000000000000
--- a/sys-cluster/galera/files/disable-tests.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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 -aurN a/SConstruct b/SConstruct
---- a/SConstruct 2013-03-11 02:44:50.000000000 -0400
-+++ b/SConstruct 2013-05-13 13:11:03.493597370 -0400
-@@ -305,20 +305,6 @@
- # Clone base from default environment
- check_env = env.Clone()
-
--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)
--
--conf.Finish()
--
- # Note: Don't do this, glibc does not like static linking
- # Link unit tests statically
- # check_env.Append(LINKFLAGS = ' -static')
-@@ -328,11 +314,7 @@
- #
-
- def builder_unit_test(target, source, env):
-- app = str(source[0].abspath)
-- if os.spawnl(os.P_WAIT, app, app)==0:
-- open(str(target[0]),'w').write("PASSED\n")
-- else:
-- return 1
-+ print("Disabled\n")
- # Create a builder for tests
- bld = Builder(action = builder_unit_test)
- check_env.Append(BUILDERS = {'Test' : bld})
diff --git a/sys-cluster/galera/files/galera-3.12-strip-extra-buildconfig.patch b/sys-cluster/galera/files/galera-3.12-strip-extra-buildconfig.patch
deleted file mode 100644
index 19394250fae7..000000000000
--- a/sys-cluster/galera/files/galera-3.12-strip-extra-buildconfig.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aurN a/chromium/build_config.h b/chromium/build_config.h
---- a/chromium/build_config.h 2015-08-27 03:32:41.000000000 -0400
-+++ b/chromium/build_config.h 2015-09-15 09:50:21.765091000 -0400
-@@ -46,8 +46,6 @@
- #elif defined(__sun)
- #define OS_SOLARIS 1
- #define TOOLKIT_GTK
--#else
--#error Please add support for your platform in build/build_config.h
- #endif
-
- #if defined(USE_OPENSSL) && defined(USE_NSS)
-@@ -132,8 +130,6 @@
- #define ARCH_CPU_32_BITS 1
- #endif
- #define ARCH_CPU_BIG_ENDIAN 1
--#else
--#error Please add support for your architecture in build/build_config.h
- #endif
-
- // Type detection for wchar_t.
diff --git a/sys-cluster/galera/files/galera-3.12-strip-machine-cflags.patch b/sys-cluster/galera/files/galera-3.12-strip-machine-cflags.patch
deleted file mode 100644
index 414996b482f3..000000000000
--- a/sys-cluster/galera/files/galera-3.12-strip-machine-cflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
---- a/galerautils/src/SConscript 2015-03-16 07:18:42.000000000 -0400
-+++ b/galerautils/src/SConscript 2015-04-07 15:03:21.661301200 -0400
-@@ -1,4 +1,4 @@
--Import('env', 'x86', 'sysname')
-+Import('env', 'sysname')
-
- libgalerautils_env = env.Clone()
-
-@@ -33,21 +33,6 @@
- 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 -aurN a/SConstruct b/SConstruct
---- a/SConstruct 2015-09-15 09:15:07.770091000 -0400
-+++ b/SConstruct 2015-09-15 09:18:41.160091000 -0400
-@@ -87,29 +87,6 @@
- if dbug:
- opt_flags = opt_flags + ' -DGU_DBUG_ON'
-
--if sysname == 'sunos':
-- compile_arch = ' -mtune=native'
-- link_arch = ''
--elif x86:
-- if bits == 32:
-- compile_arch = ' -m32 -march=i686'
-- link_arch = compile_arch
-- if sysname == 'linux':
-- link_arch = link_arch + ' -Wl,-melf_i386'
-- else:
-- compile_arch = ' -m64'
-- link_arch = compile_arch
-- if sysname == 'linux':
-- link_arch = link_arch + ' -Wl,-melf_x86_64'
--elif machine == 's390x':
-- compile_arch = ' -mzarch -march=z196 -mtune=zEC12'
-- link_arch = ''
-- if bits == 32:
-- compile_arch += ' -m32'
--else:
-- compile_arch = ' -mtune=native'
-- link_arch = ''
--
-
- boost = int(ARGUMENTS.get('boost', 1))
- boost_pool = int(ARGUMENTS.get('boost_pool', 0))
diff --git a/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch
deleted file mode 100644
index 972152d1e97e..000000000000
--- a/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
---- a/galerautils/src/SConscript 2015-03-16 07:18:42.000000000 -0400
-+++ b/galerautils/src/SConscript 2015-04-07 15:03:21.661301200 -0400
-@@ -1,4 +1,4 @@
--Import('env', 'x86', 'sysname')
-+Import('env', 'sysname')
-
- libgalerautils_env = env.Clone()
-
-@@ -39,21 +39,6 @@
- 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 -aurN a/SConstruct b/SConstruct
---- a/SConstruct 2015-09-15 09:15:07.770091000 -0400
-+++ b/SConstruct 2015-09-15 09:18:41.160091000 -0400
-@@ -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 = ''
-@@ -97,26 +97,6 @@
- if dbug:
- opt_flags = opt_flags + ' -DGU_DBUG_ON'
-
--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 -march=z196 -mtune=zEC12'
-- if bits == 32:
-- compile_arch += ' -m32'
--
- boost = int(ARGUMENTS.get('boost', 1))
- boost_pool = int(ARGUMENTS.get('boost_pool', 0))
- ssl = int(ARGUMENTS.get('ssl', 1))
diff --git a/sys-cluster/galera/files/galera-strip-machine-cflags.patch b/sys-cluster/galera/files/galera-strip-machine-cflags.patch
deleted file mode 100644
index 5aca0f709f44..000000000000
--- a/sys-cluster/galera/files/galera-strip-machine-cflags.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
---- a/galerautils/src/SConscript 2015-03-16 07:18:42.000000000 -0400
-+++ b/galerautils/src/SConscript 2015-04-07 15:03:21.661301200 -0400
-@@ -1,4 +1,4 @@
--Import('env', 'x86', 'sysname')
-+Import('env', 'sysname')
-
- libgalerautils_env = env.Clone()
-
-@@ -33,21 +33,6 @@
- crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
- crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
-
--if x86 != 0:
-- 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 2015-04-07 14:53:59.810301200 -0400
-+++ b/SConstruct 2015-04-07 14:54:48.700301200 -0400
-@@ -87,27 +87,6 @@
- opt_flags = opt_flags + ' -DGU_DBUG_ON'
-
-
--if x86 == 32:
-- compile_arch = ' -m32 -march=i686'
-- link_arch = compile_arch
-- if sysname == 'linux':
-- link_arch = link_arch + ' -Wl,-melf_i386'
--elif x86 == 64 and sysname != 'sunos':
-- compile_arch = ' -m64'
-- link_arch = compile_arch
-- if sysname == 'linux':
-- link_arch = link_arch + ' -Wl,-melf_x86_64'
--elif machine == 'ppc64':
-- compile_arch = ' -mtune=native'
-- link_arch = ''
--elif sysname == 'sunos':
-- compile_arch = ' -mtune=native'
-- link_arch = ''
--else:
-- compile_arch = ''
-- link_arch = ''
--
--
- boost = int(ARGUMENTS.get('boost', 1))
- boost_pool = int(ARGUMENTS.get('boost_pool', 0))
- ssl = int(ARGUMENTS.get('ssl', 1))
diff --git a/sys-cluster/galera/files/respect-flags.patch b/sys-cluster/galera/files/respect-flags.patch
deleted file mode 100644
index d7e5f37817ef..000000000000
--- 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)