From e971bdbd51404cbaa79d23c9053e06223f3185b1 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 24 Jul 2014 12:06:16 +0000 Subject: main/open-vm-tools-grsec: fix buildling with newer kernels patches found on arch linux AUR: https://aur.archlinux.org/packages/open-vm-tools-dkms/ --- .../0002-Conditionally-define-g_info-macro.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 main/open-vm-tools-grsec/0002-Conditionally-define-g_info-macro.patch (limited to 'main/open-vm-tools-grsec/0002-Conditionally-define-g_info-macro.patch') diff --git a/main/open-vm-tools-grsec/0002-Conditionally-define-g_info-macro.patch b/main/open-vm-tools-grsec/0002-Conditionally-define-g_info-macro.patch new file mode 100755 index 0000000000..71a586cd7c --- /dev/null +++ b/main/open-vm-tools-grsec/0002-Conditionally-define-g_info-macro.patch @@ -0,0 +1,34 @@ +From 9a38a9da20c898c4c21e84e1cf4f97c5b63f6a87 Mon Sep 17 00:00:00 2001 +From: "Scott M. Kroll" +Date: Mon, 14 Jul 2014 11:25:10 -0400 +Subject: [PATCH 2/5] Conditionally define g_info macro + +* Some versions of GLib define this macro. +--- + open-vm-tools/lib/include/vmware/tools/log.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/open-vm-tools/lib/include/vmware/tools/log.h b/open-vm-tools/lib/include/vmware/tools/log.h +index 526b7c2..fa7deb4 100644 +--- a/lib/include/vmware/tools/log.h ++++ b/lib/include/vmware/tools/log.h +@@ -121,6 +121,7 @@ + # define FUNC __FUNCTION__ + #endif + ++#ifndef g_info + /* + ******************************************************************************* + * g_info -- */ /** +@@ -135,7 +136,7 @@ + */ + + #define g_info(fmt, ...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, fmt, ## __VA_ARGS__) +- ++#endif + + /* + ******************************************************************************* +-- +2.0.1 + -- cgit v1.2.3