FHASLOCK - FIF_HASLOCK (Was: CVS: cvs.openbsd.org: src)

2013-06-07 Thread David Coppa 
On Tue, 04 Jun 2013, Philip Guenther wrote:

 CVSROOT:  /cvs
 Module name:  src
 Changes by:   guent...@cvs.openbsd.org2013/06/04 19:26:00
 
 Modified files:
   sys/sys: fcntl.h file.h 
   sys/kern   : kern_descrip.c vfs_syscalls.c vfs_vnops.c 
   usr.sbin/pstat : pstat.c 
 
 Log message:
 Move FHASLOCK from f_flag to f_iflags, freeing up a bit for passing
 O_* flags and eliminating an XXX comment.
 
 ok matthew@ deraadt@

This change broke sysutils/lsof.

cc  -DOPENBSDV=5000 -DN_UNIXV=/bsd -DHASNFSPROTO -DHASIPv6 -DHAS9660FS=1 
-DHASMSDOSFS=1 -DHASI_E2FS_PTR -DHASEXT2FS=2 -DHASEFFNLINK=i_effnlink 
-DHAS_DINODE_U -DHASI_FFS1 -DHAS_UM_UFS -DHASNCVPID -DUVM -DHAS_UVM_INCL 
-DHAS_SYS_PIPEH -DHASKVMGETPROC2 -DHASKVMGETPROCS -DHAS_STRFTIME 
-DLSOF_VSTR=\5.3\ -I/usr/include -I/sys -O2 -pipe   -c dstore.c
dstore.c:112: error: 'FHASLOCK' undeclared here (not in a function)
*** Error 1 in /usr/ports/pobj/lsof-4.87/lsof_4.87/lsof_4.87_src (sys.mk:87 
'dstore.o')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2643 
'/usr/ports/pobj/lsof-4.87/.build_done')
*** Error 1 in /usr/ports/sysutils/lsof 
(/usr/ports/infrastructure/mk/bsd.port.mk:2372 'build')

Ciao,
David

Re: FHASLOCK - FIF_HASLOCK (Was: CVS: cvs.openbsd.org: src)

2013-06-07 Thread Landry Breuil 
On Fri, Jun 07, 2013 at 04:57:25PM +0200, David Coppa wrote:
 On Tue, 04 Jun 2013, Philip Guenther wrote:
 
  CVSROOT:/cvs
  Module name:src
  Changes by: guent...@cvs.openbsd.org2013/06/04 19:26:00
  
  Modified files:
  sys/sys: fcntl.h file.h 
  sys/kern   : kern_descrip.c vfs_syscalls.c vfs_vnops.c 
  usr.sbin/pstat : pstat.c 
  
  Log message:
  Move FHASLOCK from f_flag to f_iflags, freeing up a bit for passing
  O_* flags and eliminating an XXX comment.
  
  ok matthew@ deraadt@
 
 This change broke sysutils/lsof.
 
 cc  -DOPENBSDV=5000 -DN_UNIXV=/bsd -DHASNFSPROTO -DHASIPv6 -DHAS9660FS=1 
 -DHASMSDOSFS=1 -DHASI_E2FS_PTR -DHASEXT2FS=2 -DHASEFFNLINK=i_effnlink 
 -DHAS_DINODE_U -DHASI_FFS1 -DHAS_UM_UFS -DHASNCVPID -DUVM -DHAS_UVM_INCL 
 -DHAS_SYS_PIPEH -DHASKVMGETPROC2 -DHASKVMGETPROCS -DHAS_STRFTIME 
 -DLSOF_VSTR=\5.3\ -I/usr/include -I/sys -O2 -pipe   -c dstore.c
 dstore.c:112: error: 'FHASLOCK' undeclared here (not in a function)
 *** Error 1 in /usr/ports/pobj/lsof-4.87/lsof_4.87/lsof_4.87_src (sys.mk:87 
 'dstore.o')
 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2643 
 '/usr/ports/pobj/lsof-4.87/.build_done')
 *** Error 1 in /usr/ports/sysutils/lsof 
 (/usr/ports/infrastructure/mk/bsd.port.mk:2372 'build')

Cant we whack lsof instead so that it doesnt try to reach non-public
includes in /sys ? Also, do you have an up2date src/sys ?

Landry

Re: FHASLOCK - FIF_HASLOCK (Was: CVS: cvs.openbsd.org: src)

2013-06-07 Thread Philip Guenther 
On Fri, 7 Jun 2013, David Coppa wrote:
 This change broke sysutils/lsof.
 
 cc  -DOPENBSDV=5000 -DN_UNIXV=/bsd -DHASNFSPROTO -DHASIPv6 -DHAS9660FS=1 
 -DHASMSDOSFS=1 -DHASI_E2FS_PTR -DHASEXT2FS=2 -DHASEFFNLINK=i_effnlink 
 -DHAS_DINODE_U -DHASI_FFS1 -DHAS_UM_UFS -DHASNCVPID -DUVM -DHAS_UVM_INCL 
 -DHAS_SYS_PIPEH -DHASKVMGETPROC2 -DHASKVMGETPROCS -DHAS_STRFTIME 
 -DLSOF_VSTR=\5.3\ -I/usr/include -I/sys -O2 -pipe   -c dstore.c
 dstore.c:112: error: 'FHASLOCK' undeclared here (not in a function)
 *** Error 1 in /usr/ports/pobj/lsof-4.87/lsof_4.87/lsof_4.87_src (sys.mk:87 
 'dstore.o')
 *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2643 
 '/usr/ports/pobj/lsof-4.87/.build_done')
 *** Error 1 in /usr/ports/sysutils/lsof 
 (/usr/ports/infrastructure/mk/bsd.port.mk:2372 'build')

Just delete the
{ (long)FHASLOCK,   FF_HASLOCK  },

line from dstore.c, or maybe wrap it in #if defined(FHASHLOCK) like 
FMARK and FDEFER are.


Philip

Re: FHASLOCK - FIF_HASLOCK (Was: CVS: cvs.openbsd.org: src)

2013-06-07 Thread Scott McEachern 

On 06/07/13 12:17, Philip Guenther wrote:

On Fri, 7 Jun 2013, David Coppa wrote:

This change broke sysutils/lsof.

cc  -DOPENBSDV=5000 -DN_UNIXV=/bsd -DHASNFSPROTO -DHASIPv6 -DHAS9660FS=1 -DHASMSDOSFS=1 
-DHASI_E2FS_PTR -DHASEXT2FS=2 -DHASEFFNLINK=i_effnlink -DHAS_DINODE_U -DHASI_FFS1 
-DHAS_UM_UFS -DHASNCVPID -DUVM -DHAS_UVM_INCL -DHAS_SYS_PIPEH -DHASKVMGETPROC2 
-DHASKVMGETPROCS -DHAS_STRFTIME -DLSOF_VSTR=\5.3\ -I/usr/include -I/sys -O2 
-pipe   -c dstore.c
dstore.c:112: error: 'FHASLOCK' undeclared here (not in a function)
*** Error 1 in /usr/ports/pobj/lsof-4.87/lsof_4.87/lsof_4.87_src (sys.mk:87 
'dstore.o')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2643 
'/usr/ports/pobj/lsof-4.87/.build_done')
*** Error 1 in /usr/ports/sysutils/lsof 
(/usr/ports/infrastructure/mk/bsd.port.mk:2372 'build')

Just delete the
 { (long)FHASLOCK,   FF_HASLOCK  },

line from dstore.c, or maybe wrap it in #if defined(FHASHLOCK) like
FMARK and FDEFER are.


Philip



I just deleted it and lsof built.  Something in kde4 (qt4, I believe) 
wants it, so now my make package of kde4 can continue.


BTW, excellent timing with your fix... you sent it within *minutes* of 
my running into that problem.


--
Scott McEachern

https://www.blackstaff.ca

Those who would give up essential liberty to purchase a little temporary safety 
deserve neither liberty nor safety. -- Benjamin Franklin

Re: FHASLOCK - FIF_HASLOCK (Was: CVS: cvs.openbsd.org: src)

2013-06-07 Thread Matthias Kilian 
On Fri, Jun 07, 2013 at 05:08:37PM +0200, Landry Breuil wrote:
 Cant we whack lsof instead so that it doesnt try to reach non-public
 includes in /sys ? Also, do you have an up2date src/sys ?

I had (and still have) a diff back from 2010, but IIRC, pvalchev@
complained (and was right complaining). I'll try to find the mails
from those days.

Ciao,
Kili