diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-01-02 15:32:02 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-01-02 15:32:49 +0000 |
| commit | f6a385f8b07c6b6c16fc026dffa0b29d097b785d (patch) | |
| tree | c75c172975f5a36407386c4e6575f5d15792e4a6 /main/open-vm-tools/0004-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch | |
| parent | fdccff09e3ed4ded732b2d22d5d571642ad268bc (diff) | |
| download | aports-f6a385f8b07c6b6c16fc026dffa0b29d097b785d.tar.bz2 aports-f6a385f8b07c6b6c16fc026dffa0b29d097b785d.tar.xz | |
main/open-vm-tools: upgrade to 10.1.0 and enable -dbg
Diffstat (limited to 'main/open-vm-tools/0004-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch')
| -rw-r--r-- | main/open-vm-tools/0004-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/main/open-vm-tools/0004-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch b/main/open-vm-tools/0004-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch new file mode 100644 index 0000000000..88c8e72c7f --- /dev/null +++ b/main/open-vm-tools/0004-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch @@ -0,0 +1,46 @@ +From a847af060896b6ee022306ab36bb0c2042402351 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 17 Nov 2015 10:39:01 +0000 +Subject: [PATCH 04/14] 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 <ncopa@alpinelinux.org> +--- + open-vm-tools/lib/file/fileIOPosix.c | 2 +- + open-vm-tools/lib/include/vm_basic_defs.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/open-vm-tools/lib/file/fileIOPosix.c b/open-vm-tools/lib/file/fileIOPosix.c +index b266a21b..d8c3f990 100644 +--- a/open-vm-tools/lib/file/fileIOPosix.c ++++ b/open-vm-tools/lib/file/fileIOPosix.c +@@ -205,7 +205,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. +diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h +index 4d9c70fd..27aa0e12 100644 +--- a/open-vm-tools/lib/include/vm_basic_defs.h ++++ b/open-vm-tools/lib/include/vm_basic_defs.h +@@ -568,7 +568,7 @@ typedef int pid_t; + #endif + #endif + +-#if defined __linux__ && !defined __KERNEL__ && !defined MODULE && \ ++#if defined __GLIBC__ && !defined __KERNEL__ && !defined MODULE && \ + !defined VMM && !defined FROBOS && !defined __ANDROID__ + #include <features.h> + #if __GLIBC_PREREQ(2, 1) && !defined GLIBC_VERSION_21 +-- +2.11.0 + |