- Adjustments for GCC 7
This commit is contained in:
parent
fbaf9ab545
commit
df8f30b578
|
@ -0,0 +1,11 @@
|
|||
--- a/cmake/build_configurations/compiler_options.cmake 2016-11-25 04:05:53.000000000 -0500
|
||||
+++ b/cmake/build_configurations/compiler_options.cmake 2017-02-17 12:20:04.708833670 -0500
|
||||
@@ -34,7 +34,7 @@
|
||||
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
|
||||
ENDIF()
|
||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
|
||||
+ SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive")
|
||||
# Disable inline optimizations for valgrind testing to avoid false positives
|
||||
IF(WITH_VALGRIND)
|
||||
SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}")
|
|
@ -12,10 +12,11 @@
|
|||
Summary: Online backup for InnoDB/XtraDB in MySQL, Percona Server and MariaDB
|
||||
Name: percona-xtrabackup
|
||||
Version: 2.3.6
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: GPLv2
|
||||
URL: http://www.percona.com/software/percona-xtrabackup/
|
||||
Source: https://github.com/percona/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
|
||||
Patch0: percona-xtrabackup-gcc7-flags.patch
|
||||
Provides: xtrabackup >= 2.0.0
|
||||
Provides: %{name}-%{pxbu_major_minor}
|
||||
Obsoletes: xtrabackup < 2.0.0
|
||||
|
@ -56,6 +57,7 @@ This package contains the test suite for Percona Xtrabackup
|
|||
|
||||
%prep
|
||||
%setup -qn %{name}-%{commit}
|
||||
%patch0 -p1
|
||||
|
||||
# fails build
|
||||
# build for mariadb version
|
||||
|
@ -73,6 +75,8 @@ EOF
|
|||
sed -i "s/AM_CONFIG_HEADER/AM_CONFIG_HEADERS/g" libevent/configure.in
|
||||
sed -i "s/AC_PROG_LIBTOOL/LT_INIT/g" libevent/configure.in
|
||||
sed -i "s/AC_PROG_LIBTOOL/LT_INIT/g" storage/innobase/xtrabackup/src/libarchive/configure.ac
|
||||
# GCC 7
|
||||
sed -i "s/-Werror//g" storage/innobase/xtrabackup/src/libarchive/CMakeLists.txt
|
||||
|
||||
%build
|
||||
cmake -DBUILD_CONFIG=xtrabackup_release && make -j4
|
||||
|
@ -126,6 +130,9 @@ popd
|
|||
%doc COPYING
|
||||
|
||||
%changelog
|
||||
* Fri Feb 17 2017 Peter MacKinnon <pmackinn@redhat.com> - 2.3.6-3
|
||||
- Adjustments for GCC 7
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue