diff options
| author | B Stack <bgstack15@gmail.com> | 2019-10-22 13:56:22 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2019-10-22 13:56:22 -0400 |
| commit | 1240098e4905fc5fdf54740709873bed5137f7eb (patch) | |
| tree | 90cf843f39b7886d3e8cbaa273c7d5b92ca64c13 | |
| parent | WIP: fix el patch (diff) | |
| download | stackrpms-1240098e4905fc5fdf54740709873bed5137f7eb.tar.gz stackrpms-1240098e4905fc5fdf54740709873bed5137f7eb.tar.bz2 stackrpms-1240098e4905fc5fdf54740709873bed5137f7eb.zip | |
WIP: test a separate patch for the include <bit>
| -rw-r--r-- | freefilesync/ffs_bit.patch | 26 | ||||
| -rw-r--r-- | freefilesync/ffs_el.patch | 15 | ||||
| -rw-r--r-- | freefilesync/freefilesync.spec | 4 |
3 files changed, 30 insertions, 15 deletions
diff --git a/freefilesync/ffs_bit.patch b/freefilesync/ffs_bit.patch new file mode 100644 index 0000000..3cc6ccc --- /dev/null +++ b/freefilesync/ffs_bit.patch @@ -0,0 +1,26 @@ +Author: bgstack15 +Date: 2019-10-22 +Version: FreeFileSync 10.17 +Distro: el7,el8,fc29 +Message: Some library is not available to these older distros, and it doesn't matter too much so far. +diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.17-0/zen/build_info.h 10.17-1/zen/build_info.h +--- 10.17-0/zen/build_info.h 2019-10-21 11:23:51.249139703 -0400 ++++ 10.17-1/zen/build_info.h 2019-10-22 13:53:00.207113564 -0400 +@@ -7,7 +7,7 @@ + #ifndef BUILD_INFO_H_5928539285603428657 + #define BUILD_INFO_H_5928539285603428657 + +- #include <bit> //std::endian ++ //#include <bit> //std::endian + + #define ZEN_ARCH_32BIT 32 + #define ZEN_ARCH_64BIT 64 +@@ -24,7 +24,7 @@ + + constexpr bool usingLittleEndian() + { +- return std::endian::native == std::endian::little; ++ return true; + } + + #endif //BUILD_INFO_H_5928539285603428657 diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch index 5365636..b25c74e 100644 --- a/freefilesync/ffs_el.patch +++ b/freefilesync/ffs_el.patch @@ -107,21 +107,6 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/wx+/app_main.h 10.11-1/wx+/ #include <wx/window.h> #include <wx/app.h> -Version: FreeFileSync 10.17 -Distro: EL7,EL8,fc29 -Message: short-circuit for EL and Fedora 29. This probably has to do with gcc < 9. Conveniently, x86 and x86_64 are my only targets and they are little-endian. -diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.17-0/zen/build_info.h 10.17-1/zen/build_info.h ---- 10.17-0/zen/build_info.h 2019-10-21 11:23:51.249139703 -0400 -+++ 10.17-1/zen/build_info.h 2019-10-22 11:40:19.873435707 -0400 -@@ -24,7 +24,7 @@ - - constexpr bool usingLittleEndian() - { -- return std::endian::native == std::endian::little; -+ return true; - } - - #endif //BUILD_INFO_H_5928539285603428657 diff -Naur -x '*.orig' -x '*.rej' -x '*.swp' 10.11-0/zen/ring_buffer.h 10.11-1/zen/ring_buffer.h --- 10.11-0/zen/ring_buffer.h 2019-04-12 07:59:46.098196548 -0400 +++ 10.11-1/zen/ring_buffer.h 2019-04-12 10:19:57.228913439 -0400 diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 157c66b..a10ff55 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -39,6 +39,7 @@ Patch4: ffs_fedora.patch Patch5: ffs_el.patch Patch6: ffs_libssh2.patch Patch7: ffs_curl.patch +Patch8: ffs_bit.patch Packager: B Stack <bgstack15@gmail.com> # WARNING: the build will FAIL if you have wxGTK3-devel installed. Only wxGTK2-devel should be on the build system. @@ -94,6 +95,9 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ %endif %patch6 -p1 %patch7 -p1 +%if 0%{?el6}%{?el7}%{?el8}{?fc29} +%patch8 -p1 +%endif # custom build parameters for packaging application in rpm # fedora provides build_cxxflags, which is really just optflags |