From b858bdd8f2eaaec5163f0a4121ab799875a07518 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 11 Mar 2016 07:41:18 +0000 Subject: mainsysutils/freefilesync: unbreak build on 10.x error: invalid value 'c++14' in '-std=c++14' ../../zen/file_access.cpp:893:15: error: no member named 'futimens' in the global namespace if (::futimens(fdFile, newTimes) != 0) ~~^ ../../zen/file_access.cpp:898:15: error: no member named 'utimensat' in the global namespace if (::utimensat(AT_FDCWD, filePath.c_str(), newTimes, AT_SYMLINK_NOFOLLOW) != 0) ~~^ 2 errors generated. PR: 207879 Reported by: pkg-fallout Approved by: kevlo (maintainer, previous version) --- .../freefilesync/files/patch-zen_file__access.cpp | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 sysutils/freefilesync/files/patch-zen_file__access.cpp (limited to 'sysutils/freefilesync/files/patch-zen_file__access.cpp') diff --git a/sysutils/freefilesync/files/patch-zen_file__access.cpp b/sysutils/freefilesync/files/patch-zen_file__access.cpp new file mode 100644 index 000000000000..385996b71b9d --- /dev/null +++ b/sysutils/freefilesync/files/patch-zen_file__access.cpp @@ -0,0 +1,23 @@ +--- ../../zen/file_access.cpp.orig 2016-01-11 12:13:10 UTC ++++ ../../zen/file_access.cpp +@@ -877,6 +877,11 @@ void setFileTimeRaw(const Zstring& fileP + //https://sourceforge.net/p/freefilesync/discussion/open-discussion/thread/218564cf/ + newTimes[1] = modTime; //modification time + ++#if defined(__FreeBSD__) ++#include ++#if __FreeBSD_version < 1002506 || (__FreeBSD_version >= 1100000 && __FreeBSD_version < 1100056) ++ throw ErrorLinuxFallbackToUtimes(L""); ++#else + //=> using open()/futimens() for regular files and utimensat(AT_SYMLINK_NOFOLLOW) for symlinks is consistent with "cp" and "touch"! + if (procSl == ProcSymlink::FOLLOW) + { +@@ -898,6 +903,8 @@ void setFileTimeRaw(const Zstring& fileP + if (::utimensat(AT_FDCWD, filePath.c_str(), newTimes, AT_SYMLINK_NOFOLLOW) != 0) + THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot write modification time of %x."), L"%x", fmtPath(filePath)), L"utimensat"); + } ++#endif ++#endif + } + + -- cgit v1.2.3