diff options
Diffstat (limited to 'freefilesync/debian/patches/ffs_gcc.patch')
| -rw-r--r-- | freefilesync/debian/patches/ffs_gcc.patch | 53 |
1 files changed, 12 insertions, 41 deletions
diff --git a/freefilesync/debian/patches/ffs_gcc.patch b/freefilesync/debian/patches/ffs_gcc.patch index e5a5a96..21a338d 100644 --- a/freefilesync/debian/patches/ffs_gcc.patch +++ b/freefilesync/debian/patches/ffs_gcc.patch @@ -1,51 +1,22 @@ -Date: 2022-05-24 -Version: 11.21 +Date: 2022-09-07 +Version: 11.25 Message: Parameterize the C++ compiler invocation, and use g++-12 Author: bgstack15 -diff -aur 11.2-1/FreeFileSync/Source/Makefile 11.2-2/FreeFileSync/Source/Makefile ---- 11.2-1/FreeFileSync/Source/Makefile 2020-10-02 14:59:35.816639878 -0400 -+++ 11.2-2/FreeFileSync/Source/Makefile 2020-10-02 14:59:54.220866929 -0400 -@@ -1,4 +1,5 @@ +--- a/FreeFileSync/Source/Makefile ++++ b/FreeFileSync/Source/Makefile +@@ -1,5 +1,6 @@ + CXX ?= g++ exeName = FreeFileSync +CXX=g++-12 - cxxFlags += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ + CXXFLAGS += -std=c++2b -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 -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ -@@ -115,11 +116,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 -aur 11.2-1/FreeFileSync/Source/RealTimeSync/Makefile 11.2-2/FreeFileSync/Source/RealTimeSync/Makefile ---- 11.2-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-10-02 14:59:35.820639928 -0400 -+++ 11.2-2/FreeFileSync/Source/RealTimeSync/Makefile 2020-10-02 14:59:54.220866929 -0400 -@@ -1,4 +1,5 @@ +--- a/FreeFileSync/Source/RealTimeSync/Makefile ++++ b/FreeFileSync/Source/RealTimeSync/Makefile +@@ -1,5 +1,6 @@ + CXX ?= g++ exeName = RealTimeSync +CXX=g++-12 - cxxFlags += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ + CXXFLAGS += -std=c++2b -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 -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \ -@@ -54,11 +55,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) - |