rpms/galera
5
0
Fork 0
Code Issues Pull Requests Releases Activity

import galera-25.3.26-1.module+el8.1.0+3974+90eded84

Browse Source
This commit is contained in:
CentOS Sources 2020-01-21 15:54:52 -05:00 committed by Stepan Oksanichenko
parent b0a7e63c1b
commit 1ab426cc91
4 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.galera.metadata
View File

@ -1 +1 @@
000e20ad02113e796a8a551a2733674338fbbc92 SOURCES/galera-25.3.23.tar.gz 66615f585b3413fd112087092cc63be5b5bba57d SOURCES/galera-25.3.26.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/galera-25.3.23.tar.gz SOURCES/galera-25.3.26.tar.gz

12
SOURCES/galera-python3.patch
View File

@ -2,16 +2,16 @@ Upstream PR:
https://github.com/codership/galera/pull/512 https://github.com/codership/galera/pull/512
diff -up galera-25.3.23/SConstruct.bak galera-25.3.23/SConstruct diff -up galera-25.3.23/SConstruct.bak galera-25.3.23/SConstruct
--- galera-25.3.23/SConstruct.bak 2018-07-13 15:14:49.059835554 +0200 --- galera-25.3.26/SConstruct.bak 2018-07-13 15:14:49.059835554 +0200
+++ galera-25.3.23/SConstruct 2018-07-13 15:19:07.717967794 +0200 +++ galera-25.3.26/SConstruct 2018-07-13 15:19:07.717967794 +0200
@@ -194,8 +194,8 @@ if link != 'default': @@ -194,8 +194,8 @@ if link != 'default':
env.Replace(LINK = link) env.Replace(LINK = link)
# Get compiler name/version, CXX may be set to "c++" which may be clang or gcc # Get compiler name/version, CXX may be set to "c++" which may be clang or gcc
-cc_version = read_first_line(env['CC'].split() + ['--version']) -cc_version = str(read_first_line(env['CC'].split() + ['--version']))
-cxx_version = read_first_line(env['CXX'].split() + ['--version']) -cxx_version = str(read_first_line(env['CXX'].split() + ['--version']))
+cc_version = read_first_line(env['CC'].split() + ['--version']).decode() +cc_version = str(read_first_line(env['CC'].split() + ['--version']).decode())
+cxx_version = read_first_line(env['CXX'].split() + ['--version']).decode() +cxx_version = str(read_first_line(env['CXX'].split() + ['--version']).decode())
print('Using C compiler executable: ' + env['CC']) print('Using C compiler executable: ' + env['CC'])
print('C compiler version is: ' + cc_version) print('C compiler version is: ' + cc_version)

32
SPECS/galera.spec
View File

@ -1,6 +1,6 @@
Name: galera Name: galera
Version: 25.3.23 Version: 25.3.26
Release: 5%{?dist} Release: 1%{?dist}
Summary: Synchronous multi-master wsrep provider (replication engine) Summary: Synchronous multi-master wsrep provider (replication engine)
License: GPLv2 License: GPLv2
@ -38,12 +38,29 @@ replication engine see http://www.codership.com.
%patch0 -p1 %patch0 -p1
%build %build
CPPFLAGS="%{optflags}" %{set_build_flags}
# FTBFS with the GLIBCXX_ASSERTIONS; #1546787
CPPFLAGS=`echo $CPPFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" ` CPPFLAGS=`echo $CPPFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
export CPPFLAGS CFLAGS=`echo $CFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
CXXFLAGS=`echo $CXXFLAGS| sed -e "s|-Wp,-D_GLIBCXX_ASSERTIONS||g" `
export CPPFLAGS CFLAGS CXXFLAGS
# Print help:
# scons-3 --help
# scons-3 -H
# Possibly usefull arguments:
# --debug=findlibs
# --debug=stacktrace
# --warn=all
# debug=0
%if %_arch == i686 || %_arch == i386
scons-3 %{?_smp_mflags} strict_build_flags=0 scons-3 %{?_smp_mflags} strict_build_flags=0
%else
scons-3 %{?_smp_mflags} strict_build_flags=1
%endif
%install %install
install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/garbd.service install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/garbd.service
@ -89,6 +106,11 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
%changelog %changelog
* Thu Jul 18 2019 Michal Schorm <mschorm@redhat.com> - 25.3.26-1
- Rebase to 25.3.26
Resolves: #1687879
Resolves: #1657220
* Mon Jul 16 2018 Honza Horak <hhorak@redhat.com> - 25.3.23-5 * Mon Jul 16 2018 Honza Horak <hhorak@redhat.com> - 25.3.23-5
- Require asio also on rhel - Require asio also on rhel