From 9c6c2d06e8c88013bb0fb0cf9b1d5fc5ce71878d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 26 Apr 2025 13:56:22 +0200 Subject: [PATCH] open-vm-tools: fix build with gcc-15 Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- ...ix-build-when-compiling-with-std-c23.patch | 26 +++++++++++++++++++ .../open-vm-tools/open-vm-tools_12.5.0.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch new file mode 100644 index 0000000000..aad1b10b52 --- /dev/null +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Fix-build-when-compiling-with-std-c23.patch @@ -0,0 +1,26 @@ +From 2a79621f58bf1c4bc0166ccc044fcf343fb66b44 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Wed, 20 Nov 2024 10:40:03 +1100 +Subject: [PATCH] Fix build when compiling with -std=c23 + +Fixes the build when using gcc 15 + +Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/751] +Signed-off-by: Martin Jansa +--- + open-vm-tools/lib/lock/ul.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/open-vm-tools/lib/lock/ul.c b/open-vm-tools/lib/lock/ul.c +index d376a98af..fc9fdb714 100644 +--- a/open-vm-tools/lib/lock/ul.c ++++ b/open-vm-tools/lib/lock/ul.c +@@ -29,7 +29,7 @@ + static Bool mxInPanic = FALSE; // track when involved in a panic + static Bool mxUserCollectLockingTree = FALSE; + +-Bool (*MXUserTryAcquireForceFail)() = NULL; ++Bool (*MXUserTryAcquireForceFail)(const char *) = NULL; + + static MX_Rank (*MXUserMxCheckRank)(void) = NULL; + static void (*MXUserMxLockLister)(void) = NULL; diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb index d44709a64d..0288a59458 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.5.0.bb @@ -43,6 +43,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stabl file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ + file://0001-Fix-build-when-compiling-with-std-c23.patch;patchdir=.. \ " UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P\d+(\.\d+)+)"