Commit 9b09501d authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Updated galera to 25.3.25 to be in line with MariaDB 10.3.13

parent ee7d3fd0
all:
tar xf galera-3-25.3.23.tar.gz
patch -Np1 -d galera-3-25.3.23 < galera-3-25.3.23-gcc8.patch
cd galera-3-25.3.23 && HOME=/root ./scripts/build.sh
cp galera-3-25.3.23/libgalera_smm.so /usr/lib
rm -rf galera-3-25.3.23
tar xf galera-25.3.25.tar.gz
patch -Np1 -d galera-25.3.25 < galera-25.3.25-gcc8.patch
cd galera-25.3.25 && HOME=/root ./scripts/build.sh
cp galera-25.3.25/libgalera_smm.so /usr/lib
rm -rf galera-25.3.25
This diff is collapsed.
diff -uNr galera-3-25.3.23/gcache/configure.ac galera-3-25.3.23-relaxed/gcache/configure.ac
--- galera-3-25.3.23/gcache/configure.ac 2018-02-06 21:17:00.000000000 +1030
+++ galera-3-25.3.23-relaxed/gcache/configure.ac 2018-08-31 23:32:24.680305850 +0930
@@ -80,7 +80,7 @@
AC_CONFIG_FILES([Makefile
src/Makefile])
-AM_CFLAGS="$AM_CFLAGS -Wall -Werror -Wextra -pedantic -Wno-unused-parameter"
+AM_CFLAGS="$AM_CFLAGS -Wall -Wextra -pedantic -Wno-unused-parameter"
AM_CXXFLAGS="$AM_CFLAGS -ansi -Weffc++ -Wold-style-cast -Wconversion"
AM_CXXFLAGS="$AM_CXXFLAGS -fno-rtti -Wno-long-long"
AM_CFLAGS="$AM_CFLAGS -std=c99"
diff -uNr galera-3-25.3.23/SConstruct galera-3-25.3.23-relaxed/SConstruct
--- galera-3-25.3.23/SConstruct 2018-02-06 21:17:00.000000000 +1030
+++ galera-3-25.3.23-relaxed/SConstruct 2018-08-31 23:32:05.301250294 +0930
@@ -334,7 +334,7 @@
"""
context.Message('Checking whether to enable -Weffc++ ... ')
cxxflags_orig = context.env['CXXFLAGS']
- context.env.Prepend(CXXFLAGS = '-Weffc++ -Werror ')
+ context.env.Prepend(CXXFLAGS = '-Weffc++ ')
result = context.TryLink(test_source, '.cpp')
context.env.Replace(CXXFLAGS = cxxflags_orig)
context.Result(result)
@@ -547,7 +547,7 @@
# these will be used only with our software
if strict_build_flags == 1:
- conf.env.Append(CCFLAGS = ' -Werror -pedantic')
+ conf.env.Append(CCFLAGS = ' -pedantic')
if 'clang' in cxx_version:
conf.env.Append(CCFLAGS = ' -Wno-self-assign')
conf.env.Append(CCFLAGS = ' -Wno-gnu-zero-variadic-macro-arguments')
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment