ports/152283: [PATCH] Build error: emulators/open-vm-tools

[Fumiyuki Shimizu/清 水 文 行]

>Number:         152283
>Category:       ports
>Synopsis:       [PATCH] Build error: emulators/open-vm-tools
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 16 05:40:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Fumiyuki Shimizu/清水 文行
>Release:        FreeBSD 8.1-RELEASE
>Organization:
Abacus Technologies, Inc.
>Environment:
FreeBSD 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010     root at almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
as the guest OS.
>Description:
Hello,

CFLAGS, -Werror -Wredundant-decls -Wno-missing-prototypes,
cause errors on making a module of FreeBSD vmhgfs.

-----
cc1: warnings being treated as errors
In file included from kernelStubsBSD.c:33:
kernelStubs.h:135: warning: redundant redeclaration of 'Panic'
/usr/ports/emulators/open-vm-tools/work/open-vm-tools-2010.10.18-313025/lib/include/vm_assert.h:108: warning: previous declaration of 'Panic' was here

cc1: warnings being treated as errors
vnopscommon.c:53: warning: redundant redeclaration of 'HgfsReadlinkInt'
vnopscommon.h:78: warning: previous declaration of 'HgfsReadlinkInt' was here

cc1: warnings being treated as errors
state.c:1289: warning: no previous prototype for 'HgfsMarkFileMmapped'
------

>How-To-Repeat:
Type make on emulators/open-vm-tools.
>Fix:
A patch fixing problems(manners) is attached.

Thank you,


Patch attached with submission follows:

diff -awrupN emulators/open-vm-tools/files/patch-vmhgfs-kernelStubs.h emulators/open-vm-tools.remove-warns/files/patch-vmhgfs-kernelStubs.h
--- emulators/open-vm-tools/files/patch-vmhgfs-kernelStubs.h	1970-01-01 09:00:00.000000000 +0900
+++ emulators/open-vm-tools.remove-warns/files/patch-vmhgfs-kernelStubs.h	2010-11-16 13:34:11.000000000 +0900
@@ -0,0 +1,11 @@
+--- modules/freebsd/vmhgfs/kernelStubs.h.orig	2010-10-20 05:19:54.000000000 +0900
++++ modules/freebsd/vmhgfs/kernelStubs.h	2010-11-16 13:26:24.000000000 +0900
+@@ -132,7 +132,7 @@
+  * Stub functions we provide.
+  */
+ 
+-void Panic(const char *fmt, ...);
++/* void Panic(const char *fmt, ...); -> vm_assert.h */
+ 
+ char *Str_Strcpy(char *buf, const char *src, size_t maxSize);
+ int Str_Vsnprintf(char *str, size_t size, const char *format,
diff -awrupN emulators/open-vm-tools/files/patch-vmhgfs-state.c emulators/open-vm-tools.remove-warns/files/patch-vmhgfs-state.c
--- emulators/open-vm-tools/files/patch-vmhgfs-state.c	2009-03-04 08:26:15.000000000 +0900
+++ emulators/open-vm-tools.remove-warns/files/patch-vmhgfs-state.c	2010-11-16 13:34:11.000000000 +0900
@@ -1,5 +1,5 @@
---- modules/freebsd/vmhgfs/state.c.orig	2009-02-28 23:06:10.000000000 +0100
-+++ modules/freebsd/vmhgfs/state.c	2009-02-28 23:08:59.000000000 +0100
+--- modules/freebsd/vmhgfs/state.c.orig	2010-10-20 05:19:54.000000000 +0900
++++ modules/freebsd/vmhgfs/state.c	2010-11-16 13:27:57.000000000 +0900
 @@ -770,6 +770,12 @@
        goto destroyVnode;
     }
@@ -13,3 +13,19 @@
     /*
      * Now we'll initialize the vnode.  We need to set the file type, vnode
      * operations, flags, filesystem pointer, reference count, and device.
+@@ -1277,6 +1283,7 @@
+  *----------------------------------------------------------------------------
+  */
+ 
++#if 0 /* never used */
+ void
+ HgfsMarkFileMmapped(struct vnode *vp,    // vnode which state is being changed
+                     Bool mmapped)        // New mapping state
+@@ -1286,6 +1293,7 @@
+    fp = HGFS_VP_TO_FP(vp);
+    fp->mmapped = mmapped;
+ }
++#endif
+ 
+ /* Adding/finding/removing file state from hash table */
+ 
diff -awrupN emulators/open-vm-tools/files/patch-vmhgfs-vnopscommon.c emulators/open-vm-tools.remove-warns/files/patch-vmhgfs-vnopscommon.c
--- emulators/open-vm-tools/files/patch-vmhgfs-vnopscommon.c	1970-01-01 09:00:00.000000000 +0900
+++ emulators/open-vm-tools.remove-warns/files/patch-vmhgfs-vnopscommon.c	2010-11-16 13:34:11.000000000 +0900
@@ -0,0 +1,11 @@
+--- modules/freebsd/vmhgfs/vnopscommon.c.orig	2010-10-20 05:19:54.000000000 +0900
++++ modules/freebsd/vmhgfs/vnopscommon.c	2010-11-16 13:26:55.000000000 +0900
+@@ -50,7 +50,7 @@
+ static int HgfsDoGetattrInt(const char *path, const HgfsHandle handle, HgfsSuperInfo *sip,
+ 			    HgfsAttrV2 *hgfsAttrV2);
+ static int HgfsDoGetattrByName(const char *path, HgfsSuperInfo *sip, HgfsAttrV2 *hgfsAttrV2);
+-int HgfsReadlinkInt(struct vnode *vp, struct uio *uiop);
++/* int HgfsReadlinkInt(struct vnode *vp, struct uio *uiop); -> vnopscommon.h */
+ static int HgfsQueryAttrInt(const char *path, HgfsHandle handle, HgfsSuperInfo *sip,
+                             HgfsKReqHandle req);
+ static int HgfsRefreshHandle(struct vnode *vp, HgfsSuperInfo *sip, HgfsHandle *handle);


>Release-Note:
>Audit-Trail:
>Unformatted: