commit 0406df1bdae14a63e131910762eb7aa3ad5fee3a
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sun Nov 22 00:42:20 2015 +0100
- fix building with gcc 5.x
- rel 13
gcc5.patch | 24 ++++++++++++++++++++++++
open-vm-tools.spec | 9 +++++----
2 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 921eebf..d6b7f83 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -22,7 +22,7 @@ exit 1
%define subver %(echo %{snap} | tr -d .)
%define ver 9.4.6
%define rev 1770165
-%define rel 12
+%define rel 13
%define pname open-vm-tools
%define modsrc modules/linux
Summary: VMWare guest utilities
@@ -47,6 +47,7 @@ Patch3: %{pname}-linux-3.14.patch
Patch4: %{pname}-linux-3.15.patch
Patch5: %{pname}-linux-3.16.patch
Patch6: %{pname}-linux-3.18.3.patch
+Patch7: gcc5.patch
URL: http://open-vm-tools.sourceforge.net/
BuildRequires: rpmbuild(macros) >= 1.701
%if %{with userspace}
@@ -291,14 +292,13 @@ export OVT_SOURCE_DIR=$PWD\
%prep
#setup -q -n %{pname}-%{snap}-%{rev}
%setup -q -n %{pname}-%{ver}-%{rev}
-%if %{with kernel}
%patch0 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%endif
+%patch7 -p1
cp %{SOURCE1} packaging
%{__sed} -i -e 's|##{BUILD_OUTPUT}##|build|' docs/api/doxygen.conf
@@ -317,7 +317,8 @@ export CUSTOM_PROCPS_NAME=procps
%configure2_13 \
--without-kernel-modules
%{__make} \
- CFLAGS="%{rpmcflags} -Wno-unused-but-set-variable"
+ CFLAGS="%{rpmcflags} -Wno-unused-but-set-variable" \
+ CXXFLAGS="%{rpmcxxflags} -std=c++11 -Wno-unused-but-set-variable"
%endif
%install
diff --git a/gcc5.patch b/gcc5.patch
new file mode 100644
index 0000000..fc36532
--- /dev/null
+++ b/gcc5.patch
@@ -0,0 +1,24 @@
+diff -ur open-vm-tools-9.4.6-1770165/lib/include/vm_basic_types.h
open-vm-tools-9.4.6-1770165-gcc5/lib/include/vm_basic_types.h
+--- open-vm-tools-9.4.6-1770165/lib/include/vm_basic_types.h 2014-07-02
00:21:14.000000000 +0200
++++ open-vm-tools-9.4.6-1770165-gcc5/lib/include/vm_basic_types.h
2015-11-22 00:35:43.844044867 +0100
+@@ -83,7 +83,7 @@
+
+ /* STRICT ANSI means the Xserver build and X defines Bool differently. */
+ #if !defined(_XTYPEDEF_BOOL) && \
+- (!defined(__STRICT_ANSI__) || defined(__FreeBSD__) ||
defined(__MINGW32__))
++ (!defined(__STRICT_ANSI__) || defined(__FreeBSD__) ||
defined(__MINGW32__) || !defined(Bool))
+ #define _XTYPEDEF_BOOL
+ typedef char Bool;
+ #endif
+diff -ur open-vm-tools-9.4.6-1770165/lib/include/vmblock.h
open-vm-tools-9.4.6-1770165-gcc5/lib/include/vmblock.h
+--- open-vm-tools-9.4.6-1770165/lib/include/vmblock.h 2014-07-02
00:21:14.000000000 +0200
++++ open-vm-tools-9.4.6-1770165-gcc5/lib/include/vmblock.h 2015-11-22
00:37:51.554524645 +0100
+@@ -148,7 +148,7 @@
+ # define VMBLOCK_DEVICE_MODE VMBLOCK_FUSE_DEVICE_MODE
+ # define VMBLOCK_MOUNT_POINT VMBLOCK_FUSE_MOUNT_POINT
+
+-#elif defined(linux)
++#elif defined(__linux__)
+ # define VMBLOCK_ADD_FILEBLOCK 98
+ # define VMBLOCK_DEL_FILEBLOCK 99
+ # ifdef VMX86_DEVEL
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/open-vm-tools.git/commitdiff/0406df1bdae14a63e131910762eb7aa3ad5fee3a
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
