diff options
| author | B Stack <bgstack15@gmail.com> | 2020-06-26 20:05:53 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-06-26 20:05:53 +0000 |
| commit | adedcec62e0bb184930af3d812e78cfd279abcf3 (patch) | |
| tree | 3dd5641a2a1b473d26e16f19eaefcc3144984fba /freefilesync/debian/patches/ffs_gcc.patch | |
| parent | Merge branch 'irfanview-bump' into 'master' (diff) | |
| parent | ffs dpkg gtk2 build (diff) | |
| download | stackrpms-adedcec62e0bb184930af3d812e78cfd279abcf3.tar.gz stackrpms-adedcec62e0bb184930af3d812e78cfd279abcf3.tar.bz2 stackrpms-adedcec62e0bb184930af3d812e78cfd279abcf3.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 10.25
See merge request bgstack15/stackrpms!164
Diffstat (limited to 'freefilesync/debian/patches/ffs_gcc.patch')
| -rw-r--r-- | freefilesync/debian/patches/ffs_gcc.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/freefilesync/debian/patches/ffs_gcc.patch b/freefilesync/debian/patches/ffs_gcc.patch new file mode 100644 index 0000000..ed007b5 --- /dev/null +++ b/freefilesync/debian/patches/ffs_gcc.patch @@ -0,0 +1,46 @@ +diff -Naur 10.25-1/FreeFileSync/Source/Makefile 10.25-2/FreeFileSync/Source/Makefile +--- 10.25-1/FreeFileSync/Source/Makefile 2020-06-20 13:36:08.495867672 -0400 ++++ 10.25-2/FreeFileSync/Source/Makefile 2020-06-20 13:31:36.180419862 -0400 +@@ -1,4 +1,5 @@ + exeName = FreeFileSync ++CXX=g++-10 + + 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 \ +@@ -114,11 +115,11 @@ + + ../Build/Bin/$(exeName): $(objFiles) + mkdir -p $(dir $@) +- g++ -o $@ $^ $(linkFlags) ++ $(CXX) -o $@ $^ $(linkFlags) + + $(tmpPath)/ffs/src/%.o : % + mkdir -p $(dir $@) +- g++ $(cxxFlags) -c $< -o $@ ++ $(CXX) $(cxxFlags) -c $< -o $@ + + clean: + rm -rf $(tmpPath) +diff -Naur 10.25-1/FreeFileSync/Source/RealTimeSync/Makefile 10.25-2/FreeFileSync/Source/RealTimeSync/Makefile +--- 10.25-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-06-20 13:36:08.499867723 -0400 ++++ 10.25-2/FreeFileSync/Source/RealTimeSync/Makefile 2020-06-20 13:31:48.844580205 -0400 +@@ -1,4 +1,5 @@ + exeName = RealTimeSync ++CXX=g++-10 + + 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 \ +@@ -52,11 +53,11 @@ + + ../../Build/Bin/$(exeName): $(objFiles) + mkdir -p $(dir $@) +- g++ -o $@ $^ $(linkFlags) ++ $(CXX) -o $@ $^ $(linkFlags) + + $(tmpPath)/ffs/src/rts/%.o : % + mkdir -p $(dir $@) +- g++ $(cxxFlags) -c $< -o $@ ++ $(CXX) $(cxxFlags) -c $< -o $@ + + clean: + rm -rf $(tmpPath) |