Accepting request 390775 from home:dimstar:vm
Fix build in Factory - rework build system a bit and adjust the code for posix compliance OBS-URL: https://build.opensuse.org/request/show/390775 OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=327
This commit is contained in:
Ken Johnson
Git OBS Bridge
parent
d1fc4020ee
commit
3c7c0de05c
77
open-vm-tools-buildsystem-fixup.patch
Normal file
77
open-vm-tools-buildsystem-fixup.patch
Normal file
@ -0,0 +1,77 @@
|
||||
Index: open-vm-tools/services/plugins/dndcp/Makefile.am
|
||||
===================================================================
|
||||
--- open-vm-tools.orig/services/plugins/dndcp/Makefile.am
|
||||
+++ open-vm-tools/services/plugins/dndcp/Makefile.am
|
||||
@@ -16,7 +16,7 @@
|
||||
################################################################################
|
||||
|
||||
plugindir = @VMUSR_PLUGIN_INSTALLDIR@
|
||||
-plugin_LTLIBRARIES = libdndcp.la
|
||||
+plugin_LTLIBRARIES = libdndcpdnd.la libdndcpcp.la libdndcpbld.la libdndcp.la
|
||||
|
||||
libdndcp_la_CPPFLAGS =
|
||||
libdndcp_la_CPPFLAGS += @GTK_CPPFLAGS@
|
||||
@@ -31,21 +31,25 @@ libdndcp_la_CPPFLAGS += -I$(top_builddir
|
||||
libdndcp_la_LDFLAGS =
|
||||
libdndcp_la_LDFLAGS += @PLUGIN_LDFLAGS@
|
||||
|
||||
-libdndcp_la_LIBADD =
|
||||
+libdndcp_la_LIBADD = libdndcpdnd.la libdndcpcp.la libdndcpbld.la
|
||||
libdndcp_la_LIBADD += @COMMON_XLIBS@
|
||||
libdndcp_la_LIBADD += @GTK_LIBS@
|
||||
libdndcp_la_LIBADD += @GTKMM_LIBS@
|
||||
libdndcp_la_LIBADD += @VMTOOLS_LIBS@
|
||||
libdndcp_la_LIBADD += @HGFS_LIBS@
|
||||
|
||||
-libdndcp_la_SOURCES =
|
||||
-
|
||||
-libdndcp_la_SOURCES += dnd/dndClipboard.c
|
||||
-libdndcp_la_SOURCES += dnd/dndCommon.c
|
||||
-libdndcp_la_SOURCES += dnd/dndCPMsgV4.c
|
||||
-libdndcp_la_SOURCES += dnd/dndLinux.c
|
||||
-libdndcp_la_SOURCES += dnd/dndMsg.c
|
||||
+libdndcpcp_la_CPPFLAGS =
|
||||
+libdndcpcp_la_CPPFLAGS += @GTK_CPPFLAGS@
|
||||
+libdndcpcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dnd
|
||||
+
|
||||
+libdndcpdnd_la_SOURCES =
|
||||
+libdndcpdnd_la_SOURCES += dnd/dndClipboard.c
|
||||
+libdndcpdnd_la_SOURCES += dnd/dndCommon.c
|
||||
+libdndcpdnd_la_SOURCES += dnd/dndCPMsgV4.c
|
||||
+libdndcpdnd_la_SOURCES += dnd/dndLinux.c
|
||||
+libdndcpdnd_la_SOURCES += dnd/dndMsg.c
|
||||
|
||||
+libdndcp_la_SOURCES =
|
||||
libdndcp_la_SOURCES += dndGuest/copyPasteRpcV3.cc
|
||||
libdndcp_la_SOURCES += dndGuest/dndFileList.cc
|
||||
libdndcp_la_SOURCES += dndGuest/dndRpcV3.cc
|
||||
@@ -67,8 +71,6 @@ libdndcp_la_SOURCES += dndGuest/dndCPTra
|
||||
libdndcp_la_SOURCES += stringxx/string.cc
|
||||
libdndcp_la_SOURCES += xutils/xutils.cc
|
||||
|
||||
-libdndcp_la_SOURCES += copyPasteCompat.c
|
||||
-libdndcp_la_SOURCES += copyPasteCompatX11.c
|
||||
libdndcp_la_SOURCES += copyPasteDnDWrapper.cpp
|
||||
libdndcp_la_SOURCES += copyPasteDnDX11.cpp
|
||||
libdndcp_la_SOURCES += copyPasteUIX11.cpp
|
||||
@@ -77,6 +79,10 @@ libdndcp_la_SOURCES += dndcp.cpp
|
||||
libdndcp_la_SOURCES += dragDetWndX11.cpp
|
||||
libdndcp_la_SOURCES += pointer.cpp
|
||||
|
||||
+libdndcpcp_la_SOURCES =
|
||||
+libdndcpcp_la_SOURCES += copyPasteCompat.c
|
||||
+libdndcpcp_la_SOURCES += copyPasteCompatX11.c
|
||||
+
|
||||
BUILT_SOURCES =
|
||||
BUILT_SOURCES += cpFileContents.h
|
||||
BUILT_SOURCES += cpFileContents_xdr.c
|
||||
@@ -84,7 +90,8 @@ BUILT_SOURCES += cpFileContents_xdr.c
|
||||
CLEANFILES =
|
||||
CLEANFILES += $(BUILT_SOURCES)
|
||||
|
||||
-libdndcp_la_SOURCES += cpFileContents_xdr.c
|
||||
+libdndcpbld_la_SOURCES =
|
||||
+libdndcpbld_la_SOURCES += cpFileContents_xdr.c
|
||||
|
||||
cpFileContents.h: cpFileContents.x
|
||||
@RPCGEN_WRAPPER@ services/plugins/dndcp/cpFileContents.x $@
|
||||
1061
open-vm-tools-posixly.patch
Normal file
1061
open-vm-tools-posixly.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 20 08:57:17 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
- Add open-vm-tools-posixly.patch: defined(linux) is not posix
|
||||
compliant and modern compilers no longer accept it. Change to
|
||||
defined(__linux__)
|
||||
https://github.com/vmware/open-vm-tools/pull/81
|
||||
- Add open-vm-tools-buildsystem-fixup.patch: since libsigc++ injects
|
||||
-std=c++11 into CFLAGS, the various objects in open-vm-tools need
|
||||
to be split up a bit in order to not have a mixed C/C++ object
|
||||
receiving the same CFLAGS.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 23 23:43:22 UTC 2015 - mlatimer@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package open-vm-tools
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -137,6 +137,8 @@ Requires(pre): %fillup_prereq
|
||||
Requires(pre): %insserv_prereq
|
||||
ExclusiveArch: %ix86 x86_64
|
||||
Patch0: enable-gcc46+.patch
|
||||
Patch1: open-vm-tools-posixly.patch
|
||||
Patch2: open-vm-tools-buildsystem-fixup.patch
|
||||
|
||||
%if %{KMP}
|
||||
%suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um
|
||||
@ -237,6 +239,8 @@ if you intend to create own plugins for vmtoolsd.
|
||||
# fix for an rpmlint warning regarding wrong line feeds
|
||||
sed -i -e "s/\r//" README
|
||||
%patch0 -p1
|
||||
%patch1 -p2
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
%if ! %{KMP}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user