Skip to content

Commit

Permalink
net/freerdp3: fix "sysinfo" breakage
Browse files Browse the repository at this point in the history
After upstream commit
FreeRDP/FreeRDP@4732f37
net/freerdp3 build fails in enveronments without devel/libsysinfo installed.
But with devel/libsysinfo installed net/freerdp3 grab silently
LOCALBASE/include/sys/sysinfo.h, build without errors, but sdl-freerdp
and wlfreerdp3 run failed with error:
ld-elf.so.1: /usr/local/lib/libwinpr3.so.3: Undefined symbol "sysinfo"

Upstream check supported version of the posix using _POSIX_C_SOURCE define.
This doesn't work on FreeBSD.
Together with upstream trying to find correct solution...

Approved by:	arrowd (mentor)
  • Loading branch information
VVD committed Mar 17, 2024
1 parent b8f9d31 commit f2aa302
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
1 change: 1 addition & 0 deletions net/freerdp3/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= freerdp
DISTVERSION= 3.4.0
PORTREVISION= 1
CATEGORIES= net comms
MASTER_SITES= https://pub.freerdp.com/releases/ \
https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
Expand Down
29 changes: 29 additions & 0 deletions net/freerdp3/files/patch-winpr_libwinpr_sysinfo_sysinfo.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
--- winpr/libwinpr/sysinfo/sysinfo.c.orig 2024-03-14 10:28:33 UTC
+++ winpr/libwinpr/sysinfo/sysinfo.c
@@ -34,7 +34,7 @@
#endif

#if !defined(_WIN32)
-#if defined(_POSIX_SOURCE) && (_POSIX_C_SOURCE >= 200112L)
+#if (_POSIX_C_SOURCE >= 200112L) || defined(__FreeBSD__)
#include <time.h>
#elif !defined(__APPLE__)
#include <sys/time.h>
@@ -579,7 +579,7 @@ ULONGLONG winpr_GetTickCount64(void)
UINT64 winpr_GetTickCount64NS(void)
{
UINT64 ticks = 0;
-#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L)
+#if (_POSIX_C_SOURCE >= 200112L) || defined(__FreeBSD__)
struct timespec ts = { 0 };

if (clock_gettime(CLOCK_MONOTONIC_RAW, &ts) == 0)
@@ -632,7 +632,7 @@ UINT64 winpr_GetUnixTimeNS(void)
} t = { 0 };
GetSystemTimeAsFileTime(&t.ft);
return (t.u64 - FILETIME_TO_UNIX_OFFSET_S * 10000000ull) * 100ull;
-#elif _POSIX_C_SOURCE >= 200112L
+#elif (_POSIX_C_SOURCE >= 200112L) || defined(__FreeBSD__)
struct timespec ts = { 0 };
if (clock_gettime(CLOCK_REALTIME, &ts) != 0)
return 0;

0 comments on commit f2aa302

Please sign in to comment.