1 From 39ac68abaff0d7b59cbe80036aac37f41ad976ec Mon Sep 17 00:00:00 2001
2 From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
3 Date: Wed, 24 Sep 2014 13:54:15 +0100
4 Subject: [PATCH] Add support for uClibc
6 The stable-1.1 branch of freerdp fails to build when using a uClibc
7 toolchain because it's using functions which are not implemented in
8 uClibc, like eventfd_read, eventfd_write and futimes. That is causing
9 build failures like these ones:
11 ../../libwinpr/synch/libwinpr-synch.so.0.1.0: undefined reference to
13 ../../libwinpr/synch/libwinpr-synch.so.0.1.0: undefined reference to
16 ../../common/libfreerdp-client.so.1.1.0: undefined reference to
19 This patch is based on this upstream patch:
21 https://github.com/FreeRDP/FreeRDP/commit/5f9c36da5d5cd3c5dce49f7b32fe011cb293f9ec/
23 To support newer versions of uClibc and uclibc-ng this patch also includes a
24 backported version of upstream commit 3b7d3190a16c (Fix build with newer
25 uclibc versions, 2015-04-28)
27 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
28 [baruch: merge in upstream commit 3b7d3190a16c]
29 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
31 CMakeLists.txt | 3 +++
32 channels/drive/client/drive_file.c | 12 +++++++++---
34 winpr/libwinpr/synch/event.c | 14 ++++++++++++++
35 4 files changed, 27 insertions(+), 3 deletions(-)
37 diff --git a/CMakeLists.txt b/CMakeLists.txt
38 index 375e2d1b6845..5b7887601aa0 100755
41 @@ -276,6 +276,9 @@ endif()
44 check_include_files(sys/eventfd.h HAVE_EVENTFD_H)
46 + check_symbol_exists(eventfd_read sys/eventfd.h WITH_EVENTFD_READ_WRITE)
48 set(X11_FEATURE_TYPE "RECOMMENDED")
50 set(X11_FEATURE_TYPE "DISABLED")
51 diff --git a/channels/drive/client/drive_file.c b/channels/drive/client/drive_file.c
52 index 376b4fe74be7..b20f408aa356 100644
53 --- a/channels/drive/client/drive_file.c
54 +++ b/channels/drive/client/drive_file.c
55 @@ -480,7 +480,11 @@ BOOL drive_file_set_information(DRIVE_FILE* file, UINT32 FsInformationClass, UIN
62 + struct timespec tv[2];
65 UINT32 FileAttributes;
66 UINT32 FileNameLength;
67 @@ -501,15 +505,17 @@ BOOL drive_file_set_information(DRIVE_FILE* file, UINT32 FsInformationClass, UIN
70 tv[0].tv_sec = st.st_atime;
72 tv[1].tv_sec = (LastWriteTime > 0 ? FILE_TIME_RDP_TO_SYSTEM(LastWriteTime) : st.st_mtime);
79 utimes(file->fullpath, tv);
81 - futimes(file->fd, tv);
84 + futimens(file->fd, tv);
87 if (FileAttributes > 0)
88 diff --git a/config.h.in b/config.h.in
89 index 2b8ec09c2afb..55c595d0e162 100755
93 #cmakedefine WITH_JPEG
94 #cmakedefine WITH_WIN8
95 #cmakedefine WITH_RDPSND_DSOUND
96 +#cmakedefine WITH_EVENTFD_READ_WRITE
99 #cmakedefine STATIC_CHANNELS
100 diff --git a/winpr/libwinpr/synch/event.c b/winpr/libwinpr/synch/event.c
101 index 173afafb7cc9..cb3f338178d9 100644
102 --- a/winpr/libwinpr/synch/event.c
103 +++ b/winpr/libwinpr/synch/event.c
104 @@ -115,6 +115,20 @@ HANDLE OpenEventA(DWORD dwDesiredAccess, BOOL bInheritHandle, LPCSTR lpName)
108 +#ifdef HAVE_EVENTFD_H
109 +#if !defined(WITH_EVENTFD_READ_WRITE)
110 +static int eventfd_read(int fd, eventfd_t* value)
112 + return (read(fd, value, sizeof(*value)) == sizeof(*value)) ? 0 : -1;
115 +static int eventfd_write(int fd, eventfd_t value)
117 + return (write(fd, &value, sizeof(value)) == sizeof(value)) ? 0 : -1;
122 BOOL SetEvent(HANDLE hEvent)