From 6413d57449d77bb2f9af64f3da33b28630b501d8 Mon Sep 17 00:00:00 2001 From: Henrik Riomar Date: Thu, 22 Nov 2018 13:25:10 +0100 Subject: main/open-vm-tools: upgrade 10.3.5 Rebased the patches and skiped the ones that was fixed by upstream Added check() --- ...me-that-linux-and-gnu-libc-are-the-same-t.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 main/open-vm-tools/0003-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch (limited to 'main/open-vm-tools/0003-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch') diff --git a/main/open-vm-tools/0003-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch b/main/open-vm-tools/0003-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch new file mode 100644 index 0000000000..040e719977 --- /dev/null +++ b/main/open-vm-tools/0003-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch @@ -0,0 +1,32 @@ +From 45ddb2ef1fe2e075831aae3ac37d6bde00260826 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Tue, 17 Nov 2015 10:39:01 +0000 +Subject: [PATCH 03/12] Do not assume that linux and gnu libc are the same + thing + +Use __GLIBC__ when testing for GNU libc specific things instead of +assuming that __linux__ is GNU libc. + +This is needed for building with musl libc. + +Signed-off-by: Natanael Copa +--- + open-vm-tools/lib/file/fileIOPosix.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/open-vm-tools/lib/file/fileIOPosix.c b/open-vm-tools/lib/file/fileIOPosix.c +index 23108279..603ea28d 100644 +--- a/open-vm-tools/lib/file/fileIOPosix.c ++++ b/open-vm-tools/lib/file/fileIOPosix.c +@@ -198,7 +198,7 @@ static AlignedPool alignedPool; + * are not available in any header file. + */ + +-#if defined(__linux__) && !defined(__ANDROID__) ++#if defined(__linux__) && defined(__GLIBC__) + #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) + /* + * We want preadv/pwritev. But due to FOB=64, the symbols are -64. +-- +2.19.1 + -- cgit v1.2.3