diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-04-15 07:17:09 -0700 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2021-04-17 06:47:18 -0700 |
| commit | aa54436db9d4c2968b3d9f657a81369e42e563fb (patch) | |
| tree | 6c6864e2365410464bcbf97649d2c7c286fdc749 /meta-networking | |
| parent | 62ddf0fa2bca03e399318a1d00273ce93336db8e (diff) | |
| download | meta-openembedded-aa54436db9d4c2968b3d9f657a81369e42e563fb.tar.gz | |
open-vm-tools: Fix build with gcc 11
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Trevor Gamblin <Trevor.Gamblin@windriver.com>
(cherry picked from commit 08c0280b7cea4dd1d61d98331c1cd327a82636f3)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking')
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-pollGtk-Fix-volatile-qualifier-exposed-incorrectly.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-pollGtk-Fix-volatile-qualifier-exposed-incorrectly.patch new file mode 100644 index 0000000000..fdcd7d614e --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-pollGtk-Fix-volatile-qualifier-exposed-incorrectly.patch @@ -0,0 +1,29 @@ +From 524fd4db646b4ac2155074b4cedf8436a8ff726d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 15 Apr 2021 06:58:31 -0700 +Subject: [PATCH] pollGtk: Fix volatile qualifier exposed incorrectly + +GCC11 flags it + +Fixes +glib-2.0/glib/gatomic.h:117:5: error: argument 2 of '__atomic_load' discards 'volatile' qualifier [-Werror=incompatible-pointer-types] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + open-vm-tools/lib/pollGtk/pollGtk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/open-vm-tools/lib/pollGtk/pollGtk.c b/open-vm-tools/lib/pollGtk/pollGtk.c +index 4ccaeda6..336a8bf1 100644 +--- a/open-vm-tools/lib/pollGtk/pollGtk.c ++++ b/open-vm-tools/lib/pollGtk/pollGtk.c +@@ -127,7 +127,7 @@ typedef struct Poll { + } Poll; + + static Poll *pollState; +-static volatile gsize inited = 0; ++static gsize inited = 0; + + static VMwareStatus + PollGtkCallback(PollClassSet classSet, // IN diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.2.5.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.2.5.bb index 256949a03d..473af8d41b 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.2.5.bb +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.2.5.bb @@ -44,6 +44,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ file://0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch;patchdir=.. \ file://0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ file://0001-hgfsmounter-Makefile.am-support-usrmerge.patch;patchdir=.. \ + file://0001-pollGtk-Fix-volatile-qualifier-exposed-incorrectly.patch;patchdir=.. \ " SRC_URI_append_libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ |