summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_el.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-10-23 09:55:53 -0400
committerB Stack <bgstack15@gmail.com>2019-10-23 09:55:53 -0400
commit5698f851f2b147e05aa9693cfc8d5f6e1e451635 (patch)
tree142858e10de3daf3a43147f31af82c0c1afb34cd /freefilesync/ffs_el.patch
parentWIP: fix typo (diff)
downloadstackrpms-5698f851f2b147e05aa9693cfc8d5f6e1e451635.tar.gz
stackrpms-5698f851f2b147e05aa9693cfc8d5f6e1e451635.tar.bz2
stackrpms-5698f851f2b147e05aa9693cfc8d5f6e1e451635.zip
freefilesync: el7 use c++2a now
Thanks to devtoolset-8, el7 can now compile against -std=c++2a
Diffstat (limited to 'freefilesync/ffs_el.patch')
-rw-r--r--freefilesync/ffs_el.patch13
1 files changed, 6 insertions, 7 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
bgstack15