diff options
Diffstat (limited to 'sys-cluster/galera/files')
4 files changed, 0 insertions, 126 deletions
diff --git a/sys-cluster/galera/files/galera-26.4.13-asio.patch b/sys-cluster/galera/files/galera-26.4.13-asio.patch deleted file mode 100644 index 5f20ec1624e2..000000000000 --- a/sys-cluster/galera/files/galera-26.4.13-asio.patch +++ /dev/null @@ -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 diff --git a/sys-cluster/galera/files/galera-26.4.13-tests.patch b/sys-cluster/galera/files/galera-26.4.13-tests.patch deleted file mode 100644 index 21b1b72f0058..000000000000 --- a/sys-cluster/galera/files/galera-26.4.13-tests.patch +++ /dev/null @@ -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; diff --git a/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch deleted file mode 100644 index 5f5be7a7a94b..000000000000 --- a/sys-cluster/galera/files/galera-26.4.6-strip-extra-cflags.patch +++ /dev/null @@ -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)) diff --git a/sys-cluster/galera/files/galera-26.4.8-respect-toolchain.patch b/sys-cluster/galera/files/galera-26.4.8-respect-toolchain.patch deleted file mode 100644 index 202f5aaefc03..000000000000 --- a/sys-cluster/galera/files/galera-26.4.8-respect-toolchain.patch +++ /dev/null @@ -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'])) - |