summaryrefslogtreecommitdiff
path: root/freefilesync
diff options
context:
space:
mode:
Diffstat (limited to 'freefilesync')
-rw-r--r--freefilesync/ffs_el.patch13
-rw-r--r--freefilesync/freefilesync.spec7
2 files changed, 10 insertions, 10 deletions
diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch
index b25c74e..3e1e9d3 100644
--- a/freefilesync/ffs_el.patch
+++ b/freefilesync/ffs_el.patch
@@ -21,17 +21,16 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/Makefil
@@ -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++17 -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" \
-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
-
+
-LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
+LINKFLAGS = -s -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -Wl,-z,relro -no-pie `wx-config --version=3.0 --libs std, aui --debug=no | sed -r -e 's/-[^[:space:]]+web[^[:space:]]+//;'` -lz -pthread
-
-
+
+
CXXFLAGS += `pkg-config --cflags openssl`
@@ -17,6 +17,7 @@
LINKFLAGS += `pkg-config --libs libssh2`
@@ -69,7 +68,7 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/FreeFileSync/Source/RealTim
+EXENAME = RealTimeSync
-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" \
++CXXFLAGS = -std=c++2a -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
diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec
index 4bba3cb..ce183fa 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-7
- %define scl_buildreq devtoolset-7-toolchain
+ %define scl_env devtoolset-8
+ %define scl_buildreq devtoolset-8-toolchain
%define min_libcurl >= 7.64.0
%define min_libssh2 >= 1.8.0
%define min_openssl >= 1.1.1c
@@ -200,8 +200,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
%ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml
%changelog
-* Mon Oct 21 2019 B Stack <bgstack15@gmail.com> - 10.17-1
+* Wed Oct 23 2019 B Stack <bgstack15@gmail.com> - 10.17-1
- version bump
+- el7 uses devtoolset-8 for c++2a support
* Wed Oct 09 2019 B Stack <bgstack15@gmail.com> - 10.16-2
- include support for el8
bgstack15