From ea3fbf32307a0238f74ab1758feb1149d9e1b750 Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 21 Nov 2019 21:50:41 -0500 Subject: freefilesync on el7 compiles now --- freefilesync/ffs_el.patch | 18 ++++++++++++++++-- freefilesync/freefilesync.spec | 13 ++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) (limited to 'freefilesync') diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch index f8af889..027cebf 100644 --- a/freefilesync/ffs_el.patch +++ b/freefilesync/ffs_el.patch @@ -17,12 +17,13 @@ diff -Naur 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 10.13-1/FreeFileSync/S diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/Makefile 10.11-1/FreeFileSync/Source/Makefile --- 10.11-0/FreeFileSync/Source/Makefile 2019-04-12 07:59:45.042147902 -0400 -+++ 10.15-1/FreeFileSync/Source/Makefile 2019-08-16 08:19:12.101271747 -0400 ++++ 10.18-1/FreeFileSync/Source/Makefile 2019-11-21 20:59:25.548277619 -0500 @@ -1,10 +1,10 @@ -EXENAME = FreeFileSync_$(shell arch) +EXENAME = FreeFileSync - CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ +-CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ ++CXXFLAGS = -std=c++17 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \ - -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread + -O3 -DNDEBUG -fPIC `wx-config --version=3.0 --cxxflags --debug=no` -pthread @@ -120,3 +121,16 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/zen/serialize.h 10.11-1/zen #include "string_base.h" //keep header clean from specific stream implementations! (e.g.file_io.h)! used by abstract.h! +Message: For -std=c++17 we do not get to use charconv. It appears it is not actually in use, because the application compiles with this patch. +diff -Naur -x '*.orig' -x '.git*' -x '*.swp' -x '*.rej' 10.18-0/zen/legacy_compiler.cpp 10.18-1/zen/legacy_compiler.cpp +--- 10.18-0/zen/legacy_compiler.cpp 2019-11-21 20:59:02.633016149 -0500 ++++ 10.18-1/zen/legacy_compiler.cpp 2019-11-21 20:59:31.042340308 -0500 +@@ -5,7 +5,7 @@ + // ***************************************************************************** + + #include "legacy_compiler.h" +-#include ++//#include + //1. including this one in string_tools.h blows up VC++: + // "An internal error has occurred in the compiler. (compiler file 'd:\agent\_work\1\s\src\vctools\Compiler\Utc\src\p2\p2symtab.c', line 2618)" + //2. using inside PCH: "fatal error C1076: compiler limit: internal heap limit reached" diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index e64fc02..1260fe9 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -7,8 +7,8 @@ %define scl_env %{nil} %define scl_buildreq coreutils %if 0%{?el6}%{?el7} - %define scl_env devtoolset-8 - %define scl_buildreq devtoolset-8-toolchain + %define scl_env devtoolset-7 + %define scl_buildreq devtoolset-7-toolchain %define min_libcurl >= 7.64.0 %define min_libssh2 >= 1.8.0 %define min_openssl >= 1.1.1c @@ -19,7 +19,7 @@ %endif Name: freefilesync Version: 10.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A file synchronization utility Group: Applications/File @@ -40,6 +40,7 @@ Patch5: ffs_el.patch Patch6: ffs_libssh2.patch Patch7: ffs_curl.patch Patch8: ffs_bit.patch +Patch8: ffs_no_eraseif.patch Packager: B Stack # WARNING: the build will FAIL if you have wxGTK3-devel installed. Only wxGTK2-devel should be on the build system. @@ -98,6 +99,9 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %if 0%{?el6}%{?el7}%{?el8}%{?fc29} %patch8 -p1 %endif +%if 0%{?el7} +%patch9 -p1 +%endif # custom build parameters for packaging application in rpm # fedora provides build_cxxflags, which is really just optflags @@ -200,6 +204,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Thu Nov 21 2019 B Stack - 10.18-2 +- el7 reverted to devtoolset-7, -std=c++17, and some older internal logic + * Wed Nov 20 2019 B Stack - 10.18-1 - version bump -- cgit