Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 5ae6c662fefa621f4600559e299a7d97c2254e69 Mon Sep 17 00:00:00 2001 |
| 2 | From: Natanael Copa <ncopa@alpinelinux.org> |
| 3 | Date: Sun, 16 Jul 2017 10:20:10 -0700 |
| 4 | Subject: [PATCH 1/3] Add support for building with system libtirpc |
| 5 | |
| 6 | Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> |
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 8 | |
| 9 | --- |
| 10 | open-vm-tools/configure.ac | 14 ++++++++++++++ |
| 11 | open-vm-tools/lib/dynxdr/Makefile.am | 8 ++++++-- |
| 12 | open-vm-tools/lib/err/errPosix.c | 1 + |
| 13 | open-vm-tools/lib/guestRpc/Makefile.am | 6 ++++++ |
| 14 | open-vm-tools/lib/misc/Makefile.am | 1 + |
| 15 | open-vm-tools/lib/netUtil/Makefile.am | 4 ++++ |
| 16 | open-vm-tools/lib/nicInfo/Makefile.am | 2 ++ |
| 17 | open-vm-tools/lib/rpcChannel/Makefile.am | 4 ++++ |
| 18 | open-vm-tools/lib/slashProc/Makefile.am | 4 ++++ |
| 19 | open-vm-tools/lib/string/bsd_output_shared.c | 2 +- |
| 20 | open-vm-tools/libguestlib/Makefile.am | 2 ++ |
| 21 | open-vm-tools/rpctool/Makefile.am | 3 +++ |
| 22 | open-vm-tools/rpctool/rpctool.c | 2 ++ |
| 23 | open-vm-tools/services/plugins/dndcp/Makefile.am | 2 ++ |
| 24 | open-vm-tools/services/plugins/guestInfo/Makefile.am | 1 + |
| 25 | open-vm-tools/services/plugins/resolutionSet/Makefile.am | 2 ++ |
| 26 | open-vm-tools/services/plugins/vix/Makefile.am | 2 ++ |
| 27 | open-vm-tools/services/plugins/vmbackup/Makefile.am | 2 ++ |
| 28 | open-vm-tools/toolbox/Makefile.am | 2 ++ |
| 29 | 19 files changed, 61 insertions(+), 3 deletions(-) |
| 30 | |
| 31 | Index: open-vm-tools/configure.ac |
| 32 | =================================================================== |
| 33 | --- open-vm-tools.orig/configure.ac |
| 34 | +++ open-vm-tools/configure.ac |
| 35 | @@ -405,6 +405,20 @@ AC_VMW_CHECK_LIB([fuse], |
| 36 | AC_MSG_WARN([Fuse is missing, vmblock-fuse/vmhgfs-fuse will be disabled.])]) |
| 37 | |
| 38 | # |
| 39 | +# Check for libtirpc |
| 40 | +# |
| 41 | +AC_VMW_CHECK_LIB([libtirpc], |
| 42 | + [LIBTIRPC], |
| 43 | + [libtirpc], |
| 44 | + [], |
| 45 | + [], |
| 46 | + [rpc/xdr.h], |
| 47 | + [xdr_void], |
| 48 | + [have_libtirpc=yes], |
| 49 | + [have_libtitirpc=no; |
| 50 | + AC_MSG_WARN([libtirpc is missing.])]) |
| 51 | + |
| 52 | +# |
| 53 | # Check for PAM. |
| 54 | # |
| 55 | AC_ARG_WITH([pam], |
| 56 | Index: open-vm-tools/lib/dynxdr/Makefile.am |
| 57 | =================================================================== |
| 58 | --- open-vm-tools.orig/lib/dynxdr/Makefile.am |
| 59 | +++ open-vm-tools/lib/dynxdr/Makefile.am |
| 60 | @@ -17,7 +17,11 @@ |
| 61 | |
| 62 | noinst_LTLIBRARIES = libDynxdr.la |
| 63 | |
| 64 | -libDynxdr_la_SOURCES = |
| 65 | +libDynxdr_la_SOURCES = |
| 66 | libDynxdr_la_SOURCES += dynxdr.c |
| 67 | libDynxdr_la_SOURCES += xdrutil.c |
| 68 | -libDynxdr_la_CPPFLAGS = -Wno-incompatible-pointer-types |
| 69 | +libDynxdr_la_CPPFLAGS = @LIBTIRPC_CPPFLAGS@ -Wno-incompatible-pointer-types |
| 70 | + |
| 71 | +libDynxdr_la_LIBADD = |
| 72 | +libDynxdr_la_LIBADD += @LIBTIRPC_LIBS@ |
| 73 | + |
| 74 | Index: open-vm-tools/lib/err/errPosix.c |
| 75 | =================================================================== |
| 76 | --- open-vm-tools.orig/lib/err/errPosix.c |
| 77 | +++ open-vm-tools/lib/err/errPosix.c |
| 78 | @@ -31,6 +31,7 @@ |
| 79 | #include <errno.h> |
| 80 | #include <string.h> |
| 81 | #include <locale.h> |
| 82 | +#include <stdio.h> |
| 83 | |
| 84 | #include "vmware.h" |
| 85 | #include "errInt.h" |
| 86 | Index: open-vm-tools/lib/guestRpc/Makefile.am |
| 87 | =================================================================== |
| 88 | --- open-vm-tools.orig/lib/guestRpc/Makefile.am |
| 89 | +++ open-vm-tools/lib/guestRpc/Makefile.am |
| 90 | @@ -20,6 +20,12 @@ noinst_LTLIBRARIES = libGuestRpc.la |
| 91 | libGuestRpc_la_SOURCES = |
| 92 | libGuestRpc_la_SOURCES += nicinfo_xdr.c |
| 93 | |
| 94 | +libGuestRpc_la_CPPFLAGS = |
| 95 | +libGuestRpc_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| 96 | + |
| 97 | +libGuestRpc_la_LIBADD = |
| 98 | +libGuestRpc_la_LIBADD += @LIBTIRPC_LIBS@ |
| 99 | + |
| 100 | # XXX: Autoreconf complains about this and recommends using AM_CFLAGS instead. |
| 101 | # Problem is, $(CFLAGS) is appended to the compiler command line after AM_CFLAGS |
| 102 | # and after libGuestRpc_la_CFLAGS, so "-Wall -Werror" will override this flag. |
| 103 | Index: open-vm-tools/lib/misc/Makefile.am |
| 104 | =================================================================== |
| 105 | --- open-vm-tools.orig/lib/misc/Makefile.am |
| 106 | +++ open-vm-tools/lib/misc/Makefile.am |
| 107 | @@ -52,4 +52,5 @@ libMisc_la_SOURCES += utilMem.c |
| 108 | libMisc_la_SOURCES += vmstdio.c |
| 109 | libMisc_la_SOURCES += strutil.c |
| 110 | libMisc_la_SOURCES += vthreadBase.c |
| 111 | +libMisc_la_CPPFLAGS = -Wno-error=int-conversion |
| 112 | |
| 113 | Index: open-vm-tools/lib/netUtil/Makefile.am |
| 114 | =================================================================== |
| 115 | --- open-vm-tools.orig/lib/netUtil/Makefile.am |
| 116 | +++ open-vm-tools/lib/netUtil/Makefile.am |
| 117 | @@ -20,3 +20,7 @@ noinst_LTLIBRARIES = libNetUtil.la |
| 118 | libNetUtil_la_SOURCES = |
| 119 | libNetUtil_la_SOURCES += netUtilLinux.c |
| 120 | |
| 121 | +libNetUtil_la_CPPFLAGS = |
| 122 | +libNetUtil_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| 123 | + |
| 124 | +libNetUtil_la_LIBADD = @LIBTIRPC_LIBS@ |
| 125 | Index: open-vm-tools/lib/nicInfo/Makefile.am |
| 126 | =================================================================== |
| 127 | --- open-vm-tools.orig/lib/nicInfo/Makefile.am |
| 128 | +++ open-vm-tools/lib/nicInfo/Makefile.am |
| 129 | @@ -25,12 +25,14 @@ libNicInfo_la_SOURCES += nicInfoPosix.c |
| 130 | |
| 131 | libNicInfo_la_CPPFLAGS = |
| 132 | libNicInfo_la_CPPFLAGS += @GLIB2_CPPFLAGS@ |
| 133 | +libNicInfo_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| 134 | |
| 135 | AM_CFLAGS = $(DNET_CPPFLAGS) |
| 136 | if USE_SLASH_PROC |
| 137 | AM_CFLAGS += -DUSE_SLASH_PROC |
| 138 | endif |
| 139 | libNicInfo_la_LIBADD = |
| 140 | +libNicInfo_la_LIBADD += @LIBTIRPC_LIBS@ |
| 141 | if HAVE_DNET |
| 142 | libNicInfo_la_LIBADD += @DNET_LIBS@ |
| 143 | endif |
| 144 | Index: open-vm-tools/lib/rpcChannel/Makefile.am |
| 145 | =================================================================== |
| 146 | --- open-vm-tools.orig/lib/rpcChannel/Makefile.am |
| 147 | +++ open-vm-tools/lib/rpcChannel/Makefile.am |
| 148 | @@ -27,3 +27,7 @@ endif |
| 149 | |
| 150 | libRpcChannel_la_CPPFLAGS = |
| 151 | libRpcChannel_la_CPPFLAGS += @VMTOOLS_CPPFLAGS@ |
| 152 | +libRpcChannel_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| 153 | + |
| 154 | +libRpcChannel_la_LIBADD = |
| 155 | +libRpcChannel_la_LIBADD += @LIBTIRPC_LIBS@ |
| 156 | Index: open-vm-tools/lib/slashProc/Makefile.am |
| 157 | =================================================================== |
| 158 | --- open-vm-tools.orig/lib/slashProc/Makefile.am |
| 159 | +++ open-vm-tools/lib/slashProc/Makefile.am |
| 160 | @@ -22,6 +22,10 @@ libSlashProc_la_SOURCES += net.c |
| 161 | |
| 162 | libSlashProc_la_CPPFLAGS = |
| 163 | libSlashProc_la_CPPFLAGS += @GLIB2_CPPFLAGS@ |
| 164 | +libSlashProc_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| 165 | + |
| 166 | +libSlashProc_la_LIBADD = |
| 167 | +libSlashProc_la_LIBADD += @LIBTIRPC_LIBS@ |
| 168 | |
| 169 | AM_CFLAGS = $(DNET_CPPFLAGS) |
| 170 | |
| 171 | Index: open-vm-tools/lib/string/bsd_output_shared.c |
| 172 | =================================================================== |
| 173 | --- open-vm-tools.orig/lib/string/bsd_output_shared.c |
| 174 | +++ open-vm-tools/lib/string/bsd_output_shared.c |
| 175 | @@ -38,7 +38,7 @@ |
| 176 | //#include <sys/cdefs.h> |
| 177 | |
| 178 | #if !defined(STR_NO_WIN32_LIBS) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__) |
| 179 | - |
| 180 | +#define _GNU_SOURCE |
| 181 | #include <stdio.h> |
| 182 | #include <stdlib.h> |
| 183 | #ifndef _WIN32 |
| 184 | Index: open-vm-tools/libguestlib/Makefile.am |
| 185 | =================================================================== |
| 186 | --- open-vm-tools.orig/libguestlib/Makefile.am |
| 187 | +++ open-vm-tools/libguestlib/Makefile.am |
| 188 | @@ -22,6 +22,7 @@ AM_CFLAGS += -I$(top_srcdir)/include |
| 189 | |
| 190 | libguestlib_la_LIBADD = |
| 191 | libguestlib_la_LIBADD += @VMTOOLS_LIBS@ |
| 192 | +libguestlib_la_LIBADD += @LIBTIRPC_LIBS@ |
| 193 | |
| 194 | libguestlib_la_SOURCES = |
| 195 | libguestlib_la_SOURCES += guestlibV3_xdr.c |
| 196 | @@ -56,6 +57,7 @@ CFLAGS += -Wno-unused |
| 197 | libguestlib_la_CPPFLAGS = |
| 198 | libguestlib_la_CPPFLAGS += -DVMTOOLS_USE_GLIB |
| 199 | libguestlib_la_CPPFLAGS += @GLIB2_CPPFLAGS@ |
| 200 | +libguestlib_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| 201 | |
| 202 | EXTRA_DIST = vmguestlib.pc.in |
| 203 | |
| 204 | Index: open-vm-tools/rpctool/Makefile.am |
| 205 | =================================================================== |
| 206 | --- open-vm-tools.orig/rpctool/Makefile.am |
| 207 | +++ open-vm-tools/rpctool/Makefile.am |
| 208 | @@ -17,10 +17,13 @@ |
| 209 | |
| 210 | bin_PROGRAMS = vmware-rpctool |
| 211 | |
| 212 | +vmware_rpctool_CFLAGS= @LIBTIRPC_LIBS@ |
| 213 | + |
| 214 | vmware_rpctool_SOURCES = |
| 215 | vmware_rpctool_SOURCES += rpctool.c |
| 216 | |
| 217 | vmware_rpctool_LDADD = |
| 218 | +vmware_rpctool_LDADD += @LIBTIRPC_LIBS@ |
| 219 | vmware_rpctool_LDADD += ../lib/rpcOut/libRpcOut.la |
| 220 | vmware_rpctool_LDADD += ../lib/message/libMessage.la |
| 221 | vmware_rpctool_LDADD += ../lib/backdoor/libBackdoor.la |
| 222 | Index: open-vm-tools/rpctool/rpctool.c |
| 223 | =================================================================== |
| 224 | --- open-vm-tools.orig/rpctool/rpctool.c |
| 225 | +++ open-vm-tools/rpctool/rpctool.c |
| 226 | @@ -23,6 +23,8 @@ |
| 227 | */ |
| 228 | |
| 229 | #ifndef _WIN32 |
| 230 | +#define _GNU_SOURCE |
| 231 | +#include <signal.h> |
| 232 | #include "sigPosixRegs.h" |
| 233 | #include <errno.h> |
| 234 | #include <stdint.h> |
| 235 | Index: open-vm-tools/services/plugins/dndcp/Makefile.am |
| 236 | =================================================================== |
| 237 | --- open-vm-tools.orig/services/plugins/dndcp/Makefile.am |
| 238 | +++ open-vm-tools/services/plugins/dndcp/Makefile.am |
| 239 | @@ -23,6 +23,7 @@ plugin_LTLIBRARIES = libdndcp.la |
| 240 | libdndcp_la_CPPFLAGS = |
| 241 | libdndcp_la_CPPFLAGS += @GTK_CPPFLAGS@ |
| 242 | libdndcp_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ |
| 243 | +libdndcp_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| 244 | libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dnd |
| 245 | libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/dndGuest |
| 246 | libdndcp_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/dndcp/stringxx |
| 247 | @@ -44,6 +45,7 @@ libdndcp_la_LIBADD += @GTK_LIBS@ |
| 248 | libdndcp_la_LIBADD += @GTKMM_LIBS@ |
| 249 | libdndcp_la_LIBADD += @VMTOOLS_LIBS@ |
| 250 | libdndcp_la_LIBADD += @HGFS_LIBS@ |
| 251 | +libdndcp_la_LIBADD += @LIBTIRPC_LIBS@ |
| 252 | libdndcp_la_LIBADD += $(top_builddir)/lib/hgfsUri/hgfsUriPosix.lo |
| 253 | |
| 254 | libdndcp_la_SOURCES = |
| 255 | Index: open-vm-tools/services/plugins/guestInfo/Makefile.am |
| 256 | =================================================================== |
| 257 | --- open-vm-tools.orig/services/plugins/guestInfo/Makefile.am |
| 258 | +++ open-vm-tools/services/plugins/guestInfo/Makefile.am |
| 259 | @@ -22,6 +22,7 @@ plugin_LTLIBRARIES = libguestInfo.la |
| 260 | |
| 261 | libguestInfo_la_CPPFLAGS = |
| 262 | libguestInfo_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ |
| 263 | +libguestInfo_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| 264 | |
| 265 | libguestInfo_la_LDFLAGS = |
| 266 | libguestInfo_la_LDFLAGS += @PLUGIN_LDFLAGS@ |
| 267 | Index: open-vm-tools/services/plugins/resolutionSet/Makefile.am |
| 268 | =================================================================== |
| 269 | --- open-vm-tools.orig/services/plugins/resolutionSet/Makefile.am |
| 270 | +++ open-vm-tools/services/plugins/resolutionSet/Makefile.am |
| 271 | @@ -21,6 +21,7 @@ plugin_LTLIBRARIES = libresolutionSet.la |
| 272 | libresolutionSet_la_CPPFLAGS = |
| 273 | libresolutionSet_la_CPPFLAGS += @GTK_CPPFLAGS@ |
| 274 | libresolutionSet_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ |
| 275 | +libresolutionSet_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| 276 | libresolutionSet_la_CPPFLAGS += -DRESOLUTION_X11 |
| 277 | |
| 278 | libresolutionSet_la_LDFLAGS = |
| 279 | @@ -30,6 +31,7 @@ libresolutionSet_la_LIBADD = |
| 280 | libresolutionSet_la_LIBADD += @COMMON_XLIBS@ |
| 281 | libresolutionSet_la_LIBADD += @GTK_LIBS@ |
| 282 | libresolutionSet_la_LIBADD += @VMTOOLS_LIBS@ |
| 283 | +libresolutionSet_la_LIBADD += @LIBTIRPC_LIBS@ |
| 284 | |
| 285 | libresolutionSet_la_SOURCES = |
| 286 | libresolutionSet_la_SOURCES += libvmwarectrl.c |
| 287 | Index: open-vm-tools/services/plugins/vix/Makefile.am |
| 288 | =================================================================== |
| 289 | --- open-vm-tools.orig/services/plugins/vix/Makefile.am |
| 290 | +++ open-vm-tools/services/plugins/vix/Makefile.am |
| 291 | @@ -20,6 +20,7 @@ plugin_LTLIBRARIES = libvix.la |
| 292 | |
| 293 | libvix_la_CPPFLAGS = |
| 294 | libvix_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ |
| 295 | +libvix_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| 296 | libvix_la_CPPFLAGS += -I$(top_srcdir)/vgauth/public |
| 297 | |
| 298 | libvix_la_LDFLAGS = |
| 299 | @@ -29,6 +30,7 @@ libvix_la_LIBADD = |
| 300 | libvix_la_LIBADD += @VIX_LIBADD@ |
| 301 | libvix_la_LIBADD += @VMTOOLS_LIBS@ |
| 302 | libvix_la_LIBADD += @HGFS_LIBS@ |
| 303 | +libvix_la_LIBADD += @LIBTIRPC_LIBS@ |
| 304 | libvix_la_LIBADD += $(top_builddir)/lib/auth/libAuth.la |
| 305 | libvix_la_LIBADD += $(top_builddir)/lib/foundryMsg/libFoundryMsg.la |
| 306 | libvix_la_LIBADD += $(top_builddir)/lib/impersonate/libImpersonate.la |
| 307 | Index: open-vm-tools/services/plugins/vmbackup/Makefile.am |
| 308 | =================================================================== |
| 309 | --- open-vm-tools.orig/services/plugins/vmbackup/Makefile.am |
| 310 | +++ open-vm-tools/services/plugins/vmbackup/Makefile.am |
| 311 | @@ -20,6 +20,7 @@ plugin_LTLIBRARIES = libvmbackup.la |
| 312 | |
| 313 | libvmbackup_la_CPPFLAGS = |
| 314 | libvmbackup_la_CPPFLAGS += @PLUGIN_CPPFLAGS@ |
| 315 | +libvmbackup_la_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| 316 | |
| 317 | libvmbackup_la_LDFLAGS = |
| 318 | libvmbackup_la_LDFLAGS += @PLUGIN_LDFLAGS@ |
| 319 | @@ -27,6 +28,7 @@ libvmbackup_la_LDFLAGS += @PLUGIN_LDFLAG |
| 320 | libvmbackup_la_LIBADD = |
| 321 | libvmbackup_la_LIBADD += @GOBJECT_LIBS@ |
| 322 | libvmbackup_la_LIBADD += @VMTOOLS_LIBS@ |
| 323 | +libvmbackup_la_LIBADD += @LIBTIRPC_LIBS@ |
| 324 | |
| 325 | libvmbackup_la_SOURCES = |
| 326 | libvmbackup_la_SOURCES += nullProvider.c |
| 327 | Index: open-vm-tools/toolbox/Makefile.am |
| 328 | =================================================================== |
| 329 | --- open-vm-tools.orig/toolbox/Makefile.am |
| 330 | +++ open-vm-tools/toolbox/Makefile.am |
| 331 | @@ -20,9 +20,11 @@ bin_PROGRAMS = vmware-toolbox-cmd |
| 332 | vmware_toolbox_cmd_LDADD = |
| 333 | vmware_toolbox_cmd_LDADD += ../libguestlib/libguestlib.la |
| 334 | vmware_toolbox_cmd_LDADD += @VMTOOLS_LIBS@ |
| 335 | +vmware_toolbox_cmd_LDADD += @LIBTIRPC_LIBS@ |
| 336 | |
| 337 | vmware_toolbox_cmd_CPPFLAGS = |
| 338 | vmware_toolbox_cmd_CPPFLAGS += @VMTOOLS_CPPFLAGS@ |
| 339 | +vmware_toolbox_cmd_CPPFLAGS += @LIBTIRPC_CPPFLAGS@ |
| 340 | |
| 341 | vmware_toolbox_cmd_SOURCES = |
| 342 | vmware_toolbox_cmd_SOURCES += toolbox-cmd.c |