rpms/open-vm-tools
6
0
Fork 1
Code Issues Pull Requests Releases Activity

Added gcc10-warning.patch for fixing compilation issues.

Browse Source
This commit is contained in:
Ravindra Kumar 2020-02-04 10:53:01 -08:00
parent a154334ac6
commit 8a72e48acd
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gcc10-warning.patch Normal file
View File

@ -0,0 +1,42 @@
--- a/open-vm-tools/lib/user/utilBacktrace.c 2020-02-03 12:13:08.092463938 -0800
+++ b/open-vm-tools/lib/user/utilBacktrace.c 2020-02-03 15:30:56.234489288 -0800
@@ -510,13 +510,16 @@
options.bugNumber = bugNr;
CoreDump_LogFullBacktraceToFunc(&options, outFunc, outFuncData);
#else
- uintptr_t *x = (uintptr_t *) &bugNr;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+ uintptr_t *x = ((uintptr_t *) &bugNr) - 2;
+#pragma GCC diagnostic pop
if (bugNr == 0) {
outFunc(outFuncData, "Backtrace:\n");
} else {
outFunc(outFuncData, "Backtrace for bugNr=%d\n",bugNr);
}
- Util_BacktraceFromPointerWithFunc(&x[-2], outFunc, outFuncData);
+ Util_BacktraceFromPointerWithFunc(x, outFunc, outFuncData);
#endif
}
--- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp 2020-02-03 12:13:09.572471067 -0800
+++ b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp 2020-02-03 14:03:12.518469494 -0800
@@ -94,15 +94,15 @@
* This is for V1 text copy paste only!
*/
#ifndef GDK_SELECTION_CLIPBOARD
-GdkAtom GDK_SELECTION_CLIPBOARD;
+extern GdkAtom GDK_SELECTION_CLIPBOARD;
#endif
#ifndef GDK_SELECTION_TYPE_TIMESTAMP
-GdkAtom GDK_SELECTION_TYPE_TIMESTAMP;
+extern GdkAtom GDK_SELECTION_TYPE_TIMESTAMP;
#endif
#ifndef GDK_SELECTION_TYPE_UTF8_STRING
-GdkAtom GDK_SELECTION_TYPE_UTF8_STRING;
+extern GdkAtom GDK_SELECTION_TYPE_UTF8_STRING;
#endif

8
open-vm-tools.spec
View File

@ -1,5 +1,5 @@
################################################################################ ################################################################################
### Copyright 2013-19 VMware, Inc. All rights reserved. ### Copyright 2013-2020 VMware, Inc. All rights reserved.
### ###
### RPM SPEC file for building open-vm-tools packages. ### RPM SPEC file for building open-vm-tools packages.
### ###
@ -28,7 +28,7 @@
Name: open-vm-tools Name: open-vm-tools
Version: %{toolsversion} Version: %{toolsversion}
Release: 5%{?dist} Release: 6%{?dist}
Summary: Open Virtual Machine Tools for virtual machines hosted on VMware Summary: Open Virtual Machine Tools for virtual machines hosted on VMware
License: GPLv2 License: GPLv2
URL: https://github.com/vmware/%{name} URL: https://github.com/vmware/%{name}
@ -49,6 +49,7 @@ ExclusiveArch: %{ix86} x86_64
Patch1: gcc9-static-inline.patch Patch1: gcc9-static-inline.patch
# Reference https://github.com/vmware/open-vm-tools/commit/9bc72f0b09702754b429115658a85223cb3058bd # Reference https://github.com/vmware/open-vm-tools/commit/9bc72f0b09702754b429115658a85223cb3058bd
Patch2: vix-memleak.patch Patch2: vix-memleak.patch
Patch3: gcc10-warning.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -343,6 +344,9 @@ fi
%{_bindir}/vmware-vgauth-smoketest %{_bindir}/vmware-vgauth-smoketest
%changelog %changelog
* Tue Feb 04 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.0-6
- Added gcc10-warning.patch for fixing compilation issues.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.0-5 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild