| From 5ae6c662fefa621f4600559e299a7d97c2254e69 Mon Sep 17 00:00:00 2001 |
| From: Natanael Copa <ncopa@alpinelinux.org> |
| Date: Sun, 16 Jul 2017 10:20:10 -0700 |
| Subject: [PATCH 1/3] Add support for building with system libtirpc |
| |
| Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| |
| --- |
| open-vm-tools/configure.ac | 14 ++++++++++++++ |
| open-vm-tools/lib/dynxdr/Makefile.am | 8 ++++++-- |
| open-vm-tools/lib/err/errPosix.c | 1 + |
| open-vm-tools/lib/guestRpc/Makefile.am | 6 ++++++ |
| open-vm-tools/lib/misc/Makefile.am | 1 + |
| open-vm-tools/lib/netUtil/Makefile.am | 4 ++++ |
| open-vm-tools/lib/nicInfo/Makefile.am | 2 ++ |
| open-vm-tools/lib/rpcChannel/Makefile.am | 4 ++++ |
| open-vm-tools/lib/slashProc/Makefile.am | 4 ++++ |
| open-vm-tools/lib/string/bsd_output_shared.c | 2 +- |
| open-vm-tools/libguestlib/Makefile.am | 2 ++ |
| open-vm-tools/rpctool/Makefile.am | 3 +++ |
| open-vm-tools/rpctool/rpctool.c | 2 ++ |
| open-vm-tools/services/plugins/dndcp/Makefile.am | 2 ++ |
| open-vm-tools/services/plugins/guestInfo/Makefile.am | 1 + |
| open-vm-tools/services/plugins/resolutionSet/Makefile.am | 2 ++ |
| open-vm-tools/services/plugins/vix/Makefile.am | 2 ++ |
| open-vm-tools/services/plugins/vmbackup/Makefile.am | 2 ++ |
| open-vm-tools/toolbox/Makefile.am | 2 ++ |
| 19 files changed, 61 insertions(+), 3 deletions(-) |
| |
| Index: open-vm-tools/configure.ac |
| =================================================================== |
| --- open-vm-tools.orig/configure.ac |
| +++ open-vm-tools/configure.ac |
| @@ -405,6 +405,20 @@ AC_VMW_CHECK_LIB([fuse], |
| AC_MSG_WARN([Fuse is missing, vmblock-fuse/vmhgfs-fuse will be disabled.])]) |
| |
| # |
| +# Check for libtirpc |
| +# |
| +AC_VMW_CHECK_LIB([libtirpc], |
| + [LIBTIRPC], |
| + [libtirpc], |
| + [], |
| + [], |
| + [rpc/xdr.h], |
| + [xdr_void], |
| + [have_libtirpc=yes], |
| + [have_libtitirpc=no; |
| + AC_MSG_WARN([libtirpc is missing.])]) |
| + |
| +# |
| # Check for PAM. |
| # |
| AC_ARG_WITH([pam], |
| Index: open-vm-tools/lib/dynxdr/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/lib/dynxdr/Makefile.am |
| +++ open-vm-tools/lib/dynxdr/Makefile.am |
| @@ -17,7 +17,11 @@ |
| |
| noinst_LTLIBRARIES = libDynxdr.la |
| |
| -libDynxdr_la_SOURCES = |
| +libDynxdr_la_SOURCES = |
| libDynxdr_la_SOURCES += dynxdr.c |
| libDynxdr_la_SOURCES += xdrutil.c |
| -libDynxdr_la_CPPFLAGS = -Wno-incompatible-pointer-types |
| +libDynxdr_la_CPPFLAGS = @LIBTIRPC_CPPFLAGS@ -Wno-incompatible-pointer-types |
| + |
| +libDynxdr_la_LIBADD = |
| +libDynxdr_la_LIBADD += @LIBTIRPC_LIBS@ |
| + |
| Index: open-vm-tools/lib/err/errPosix.c |
| =================================================================== |
| --- open-vm-tools.orig/lib/err/errPosix.c |
| +++ open-vm-tools/lib/err/errPosix.c |
| @@ -31,6 +31,7 @@ |
| #include <errno.h> |
| #include <string.h> |
| #include <locale.h> |
| +#include <stdio.h> |
| |
| #include "vmware.h" |
| #include "errInt.h" |
| Index: open-vm-tools/lib/guestRpc/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/lib/guestRpc/Makefile.am |
| +++ open-vm-tools/lib/guestRpc/Makefile.am |
| @@ -20,6 +20,12 @@ noinst_LTLIBRARIES = libGuestRpc.la |
| libGuestRpc_la_SOURCES = |
| libGuestRpc_la_SOURCES += nicinfo_xdr.c |
| |
| +libGuestRpc_la_CPPFLAGS = |
| +libGuestRpc_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| + |
| +libGuestRpc_la_LIBADD = |
| +libGuestRpc_la_LIBADD += @LIBTIRPC_LIBS@ |
| + |
| # XXX: Autoreconf complains about this and recommends using AM_CFLAGS instead. |
| # Problem is, $(CFLAGS) is appended to the compiler command line after AM_CFLAGS |
| # and after libGuestRpc_la_CFLAGS, so "-Wall -Werror" will override this flag. |
| Index: open-vm-tools/lib/misc/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/lib/misc/Makefile.am |
| +++ open-vm-tools/lib/misc/Makefile.am |
| @@ -52,4 +52,5 @@ libMisc_la_SOURCES += utilMem.c |
| libMisc_la_SOURCES += vmstdio.c |
| libMisc_la_SOURCES += strutil.c |
| libMisc_la_SOURCES += vthreadBase.c |
| +libMisc_la_CPPFLAGS = -Wno-error=int-conversion |
| |
| Index: open-vm-tools/lib/netUtil/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/lib/netUtil/Makefile.am |
| +++ open-vm-tools/lib/netUtil/Makefile.am |
| @@ -20,3 +20,7 @@ noinst_LTLIBRARIES = libNetUtil.la |
| libNetUtil_la_SOURCES = |
| libNetUtil_la_SOURCES += netUtilLinux.c |
| |
| +libNetUtil_la_CPPFLAGS = |
| +libNetUtil_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| + |
| +libNetUtil_la_LIBADD = @LIBTIRPC_LIBS@ |
| Index: open-vm-tools/lib/nicInfo/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/lib/nicInfo/Makefile.am |
| +++ open-vm-tools/lib/nicInfo/Makefile.am |
| @@ -25,12 +25,14 @@ libNicInfo_la_SOURCES += nicInfoPosix.c |
| |
| libNicInfo_la_CPPFLAGS = |
| libNicInfo_la_CPPFLAGS += @GLIB2_CPPFLAGS@ |
| +libNicInfo_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| |
| AM_CFLAGS = $(DNET_CPPFLAGS) |
| if USE_SLASH_PROC |
| AM_CFLAGS += -DUSE_SLASH_PROC |
| endif |
| libNicInfo_la_LIBADD = |
| +libNicInfo_la_LIBADD += @LIBTIRPC_LIBS@ |
| if HAVE_DNET |
| libNicInfo_la_LIBADD += @DNET_LIBS@ |
| endif |
| Index: open-vm-tools/lib/rpcChannel/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/lib/rpcChannel/Makefile.am |
| +++ open-vm-tools/lib/rpcChannel/Makefile.am |
| @@ -27,3 +27,7 @@ endif |
| |
| libRpcChannel_la_CPPFLAGS = |
| libRpcChannel_la_CPPFLAGS += @VMTOOLS_CPPFLAGS@ |
| +libRpcChannel_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| + |
| +libRpcChannel_la_LIBADD = |
| +libRpcChannel_la_LIBADD += @LIBTIRPC_LIBS@ |
| Index: open-vm-tools/lib/slashProc/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/lib/slashProc/Makefile.am |
| +++ open-vm-tools/lib/slashProc/Makefile.am |
| @@ -22,6 +22,10 @@ libSlashProc_la_SOURCES += net.c |
| |
| libSlashProc_la_CPPFLAGS = |
| libSlashProc_la_CPPFLAGS += @GLIB2_CPPFLAGS@ |
| +libSlashProc_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| + |
| +libSlashProc_la_LIBADD = |
| +libSlashProc_la_LIBADD += @LIBTIRPC_LIBS@ |
| |
| AM_CFLAGS = $(DNET_CPPFLAGS) |
| |
| Index: open-vm-tools/lib/string/bsd_output_shared.c |
| =================================================================== |
| --- open-vm-tools.orig/lib/string/bsd_output_shared.c |
| +++ open-vm-tools/lib/string/bsd_output_shared.c |
| @@ -38,7 +38,7 @@ |
| //#include <sys/cdefs.h> |
| |
| #if !defined(STR_NO_WIN32_LIBS) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__) |
| - |
| +#define _GNU_SOURCE |
| #include <stdio.h> |
| #include <stdlib.h> |
| #ifndef _WIN32 |
| Index: open-vm-tools/libguestlib/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/libguestlib/Makefile.am |
| +++ open-vm-tools/libguestlib/Makefile.am |
| @@ -22,6 +22,7 @@ AM_CFLAGS += -I$(top_srcdir)/include |
| |
| libguestlib_la_LIBADD = |
| libguestlib_la_LIBADD += @VMTOOLS_LIBS@ |
| +libguestlib_la_LIBADD += @LIBTIRPC_LIBS@ |
| |
| libguestlib_la_SOURCES = |
| libguestlib_la_SOURCES += guestlibV3_xdr.c |
| @@ -56,6 +57,7 @@ CFLAGS += -Wno-unused |
| libguestlib_la_CPPFLAGS = |
| libguestlib_la_CPPFLAGS += -DVMTOOLS_USE_GLIB |
| libguestlib_la_CPPFLAGS += @GLIB2_CPPFLAGS@ |
| +libguestlib_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| |
| EXTRA_DIST = vmguestlib.pc.in |
| |
| Index: open-vm-tools/rpctool/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/rpctool/Makefile.am |
| +++ open-vm-tools/rpctool/Makefile.am |
| @@ -17,10 +17,13 @@ |
| |
| bin_PROGRAMS = vmware-rpctool |
| |
| +vmware_rpctool_CFLAGS= @LIBTIRPC_LIBS@ |
| + |
| vmware_rpctool_SOURCES = |
| vmware_rpctool_SOURCES += rpctool.c |
| |
| vmware_rpctool_LDADD = |
| +vmware_rpctool_LDADD += @LIBTIRPC_LIBS@ |
| vmware_rpctool_LDADD += ../lib/rpcOut/libRpcOut.la |
| vmware_rpctool_LDADD += ../lib/message/libMessage.la |
| vmware_rpctool_LDADD += ../lib/backdoor/libBackdoor.la |
| Index: open-vm-tools/rpctool/rpctool.c |
| =================================================================== |
| --- open-vm-tools.orig/rpctool/rpctool.c |
| +++ open-vm-tools/rpctool/rpctool.c |
| @@ -23,6 +23,8 @@ |
| */ |
| |
| #ifndef _WIN32 |
| +#define _GNU_SOURCE |
| +#include <signal.h> |
| #include "sigPosixRegs.h" |
| #include <errno.h> |
| #include <stdint.h> |
| 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 |
| @@ -23,6 +23,7 @@ plugin_LTLIBRARIES = libdndcp.la |
| libdndcp_la_CPPFLAGS = |
| libdndcp_la_CPPFLAGS += @GTK_CPPFLAGS@ |
| libdndcp_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ |
| +libdndcp_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dnd |
| libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dndGuest |
| libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/stringxx |
| @@ -44,6 +45,7 @@ libdndcp_la_LIBADD += @GTK_LIBS@ |
| libdndcp_la_LIBADD += @GTKMM_LIBS@ |
| libdndcp_la_LIBADD += @VMTOOLS_LIBS@ |
| libdndcp_la_LIBADD += @HGFS_LIBS@ |
| +libdndcp_la_LIBADD += @LIBTIRPC_LIBS@ |
| libdndcp_la_LIBADD += $(top_builddir)/lib/hgfsUri/hgfsUriPosix.lo |
| |
| libdndcp_la_SOURCES = |
| Index: open-vm-tools/services/plugins/guestInfo/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/services/plugins/guestInfo/Makefile.am |
| +++ open-vm-tools/services/plugins/guestInfo/Makefile.am |
| @@ -22,6 +22,7 @@ plugin_LTLIBRARIES = libguestInfo.la |
| |
| libguestInfo_la_CPPFLAGS = |
| libguestInfo_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ |
| +libguestInfo_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| |
| libguestInfo_la_LDFLAGS = |
| libguestInfo_la_LDFLAGS += @PLUGIN_LDFLAGS@ |
| Index: open-vm-tools/services/plugins/resolutionSet/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/services/plugins/resolutionSet/Makefile.am |
| +++ open-vm-tools/services/plugins/resolutionSet/Makefile.am |
| @@ -21,6 +21,7 @@ plugin_LTLIBRARIES = libresolutionSet.la |
| libresolutionSet_la_CPPFLAGS = |
| libresolutionSet_la_CPPFLAGS += @GTK_CPPFLAGS@ |
| libresolutionSet_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ |
| +libresolutionSet_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| libresolutionSet_la_CPPFLAGS += -DRESOLUTION_X11 |
| |
| libresolutionSet_la_LDFLAGS = |
| @@ -30,6 +31,7 @@ libresolutionSet_la_LIBADD = |
| libresolutionSet_la_LIBADD += @COMMON_XLIBS@ |
| libresolutionSet_la_LIBADD += @GTK_LIBS@ |
| libresolutionSet_la_LIBADD += @VMTOOLS_LIBS@ |
| +libresolutionSet_la_LIBADD += @LIBTIRPC_LIBS@ |
| |
| libresolutionSet_la_SOURCES = |
| libresolutionSet_la_SOURCES += libvmwarectrl.c |
| Index: open-vm-tools/services/plugins/vix/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/services/plugins/vix/Makefile.am |
| +++ open-vm-tools/services/plugins/vix/Makefile.am |
| @@ -20,6 +20,7 @@ plugin_LTLIBRARIES = libvix.la |
| |
| libvix_la_CPPFLAGS = |
| libvix_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ |
| +libvix_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| libvix_la_CPPFLAGS += -I$(top_srcdir)/vgauth/public |
| |
| libvix_la_LDFLAGS = |
| @@ -29,6 +30,7 @@ libvix_la_LIBADD = |
| libvix_la_LIBADD += @VIX_LIBADD@ |
| libvix_la_LIBADD += @VMTOOLS_LIBS@ |
| libvix_la_LIBADD += @HGFS_LIBS@ |
| +libvix_la_LIBADD += @LIBTIRPC_LIBS@ |
| libvix_la_LIBADD += $(top_builddir)/lib/auth/libAuth.la |
| libvix_la_LIBADD += $(top_builddir)/lib/foundryMsg/libFoundryMsg.la |
| libvix_la_LIBADD += $(top_builddir)/lib/impersonate/libImpersonate.la |
| Index: open-vm-tools/services/plugins/vmbackup/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/services/plugins/vmbackup/Makefile.am |
| +++ open-vm-tools/services/plugins/vmbackup/Makefile.am |
| @@ -20,6 +20,7 @@ plugin_LTLIBRARIES = libvmbackup.la |
| |
| libvmbackup_la_CPPFLAGS = |
| libvmbackup_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ |
| +libvmbackup_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| |
| libvmbackup_la_LDFLAGS = |
| libvmbackup_la_LDFLAGS += @PLUGIN_LDFLAGS@ |
| @@ -27,6 +28,7 @@ libvmbackup_la_LDFLAGS += @PLUGIN_LDFLAG |
| libvmbackup_la_LIBADD = |
| libvmbackup_la_LIBADD += @GOBJECT_LIBS@ |
| libvmbackup_la_LIBADD += @VMTOOLS_LIBS@ |
| +libvmbackup_la_LIBADD += @LIBTIRPC_LIBS@ |
| |
| libvmbackup_la_SOURCES = |
| libvmbackup_la_SOURCES += nullProvider.c |
| Index: open-vm-tools/toolbox/Makefile.am |
| =================================================================== |
| --- open-vm-tools.orig/toolbox/Makefile.am |
| +++ open-vm-tools/toolbox/Makefile.am |
| @@ -20,9 +20,11 @@ bin_PROGRAMS = vmware-toolbox-cmd |
| vmware_toolbox_cmd_LDADD = |
| vmware_toolbox_cmd_LDADD += ../libguestlib/libguestlib.la |
| vmware_toolbox_cmd_LDADD += @VMTOOLS_LIBS@ |
| +vmware_toolbox_cmd_LDADD += @LIBTIRPC_LIBS@ |
| |
| vmware_toolbox_cmd_CPPFLAGS = |
| vmware_toolbox_cmd_CPPFLAGS += @VMTOOLS_CPPFLAGS@ |
| +vmware_toolbox_cmd_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| |
| vmware_toolbox_cmd_SOURCES = |
| vmware_toolbox_cmd_SOURCES += toolbox-cmd.c |