diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-03-05 12:20:59 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-03-05 12:22:57 -0800 |
| commit | 8cb1ab780f92924e56f6d2f4c1f6723667508374 (patch) | |
| tree | 783ee737ce7edd1b3c5d9f01072147a71d11e2c7 | |
| parent | 9b62982d6cade2cf7de146e50576993a6b2294b6 (diff) | |
| download | meta-openembedded-contrib-8cb1ab780f92924e56f6d2f4c1f6723667508374.tar.gz | |
open-vm-tools: Do not use volatile qualifier
gcc 11 has started to error on it
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-pollGtk-Drop-volatile-qualifier.patch | 32 | ||||
| -rw-r--r-- | meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-pollGtk-Drop-volatile-qualifier.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-pollGtk-Drop-volatile-qualifier.patch new file mode 100644 index 0000000000..adc6571f7e --- /dev/null +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-pollGtk-Drop-volatile-qualifier.patch @@ -0,0 +1,32 @@ +From 7bd280f3cc07208760759c98bbfbac3f9d28f77c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 5 Mar 2021 08:58:29 -0800 +Subject: [PATCH] pollGtk: Drop volatile qualifier + +glib-2.0 has changed the function interfaces as well and do not expect +it to be volatile. GCC 11 complains about it + +glib/gatomic.h:112: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 6d95bf01..a941e7a7 100644 +--- a/open-vm-tools/lib/pollGtk/pollGtk.c ++++ b/open-vm-tools/lib/pollGtk/pollGtk.c +@@ -1473,7 +1473,7 @@ PollGtkBasicCallback(gpointer data) // IN: The eventEntry + void + Poll_InitGtk(void) + { +- static volatile gsize inited = 0; ++ static gsize inited = 0; + + static const PollImpl gtkImpl = + { +-- +2.30.1 + diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb index 34a81d21f0..69ef6056d7 100644 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb +++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb @@ -43,6 +43,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ file://0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ file://0001-utilBacktrace-Ignore-Warray-bounds.patch;patchdir=.. \ file://0001-hgfsmounter-Makefile.am-support-usrmerge.patch;patchdir=.. \ + file://0001-pollGtk-Drop-volatile-qualifier.patch;patchdir=.. \ " SRCREV = "d3edfd142a81096f9f58aff17d84219b457f4987" |