[PATCH] notifyd

[Stefan (metze) Metzmacher]

Am 07.07.2015 um 22:50 schrieb Jeremy Allison:
> On Tue, Jul 07, 2015 at 10:48:05PM +0200, Stefan (metze) Metzmacher wrote:
>> Am 07.07.2015 um 21:22 schrieb Jeremy Allison:
>>> On Tue, Jul 07, 2015 at 09:07:46PM +0200, Volker Lendecke wrote:
>>>> On Tue, Jul 07, 2015 at 12:02:47PM -0700, Jeremy Allison wrote:
>>>>>> Attached find two files: One with the changes just for review, and one
>>>>>> with the full new version.
>>>>>
>>>>> Pushed with minor change to "smbd: Remove SMB_VFS_NOTIFY_WATCH" commit
>>>>> to add version number comment /* Version 33 - Remove notify_watch_fn */
>>>>> to source3/include/vfs.h.
>>>>>
>>>>> W00t! Amazing work, now in for 4.3.0 !!!!!
>>>>
>>>> Wait -- can we get a second ack on this before we push? This
>>>> is too large a change for just a single reviewer! Not that I
>>>> don't trust you, but the bus factor is way too low for this
>>>> if only me and you have taken a look.
>>>
>>> I did do the autobuild push already (not sure how to cancel that).
>>>
>>> Personally I feel this is no larger than the spotlight code which
>>> just went in with only 2 reviewers :-), and I'm guessing that what
>>> you really mean here is you want metze to look :-).
>>
>> Looking briefly I found a bug in source3/wscript_build
>> if bld.env['dmapi_lib'] is not empty
>> the build fails with unknown dependency to 'dmfam', there's a missing
>> whitespace.
>>
>> I'll continue tomorrow...
> 
> Well if the autobuild goes through, just post patches
> for the build system on top and I'll review.

Ok, here's the fix.

Please review and push.

Thanks!
metze
-------------- next part --------------
From c44d7e2337482174fe699f3168de66b42e6af0cd Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Wed, 8 Jul 2015 07:43:20 +0200
Subject: [PATCH] s3:wscript_build: fix the build using dmapi and fam together

Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
 source3/wscript_build | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/source3/wscript_build b/source3/wscript_build
index 8ac8eec..ace4b99 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -510,12 +510,14 @@ bld.SAMBA3_SUBSYSTEM('sysquotas',
                      deps='samba3-util samba-util')
 
 NOTIFY_SOURCES=''
+NOTIFY_DEPS=''
 
 if bld.CONFIG_SET("HAVE_INOTIFY"):
     NOTIFY_SOURCES += ' smbd/notify_inotify.c'
 
 if bld.CONFIG_SET('SAMBA_FAM_LIBS'):
     NOTIFY_SOURCES += ' smbd/notify_fam.c'
+    NOTIFY_DEPS += ' ' + bld.CONFIG_GET('SAMBA_FAM_LIBS')
 
 bld.SAMBA3_LIBRARY('smbd_base',
                    source='''
@@ -637,9 +639,9 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    netapi
                    NDR_IOCTL
                    notifyd
-                   ''' + bld.env['dmapi_lib']
-                   + (bld.CONFIG_GET('SAMBA_FAM_LIBS')
-                         if bld.CONFIG_SET('SAMBA_FAM_LIBS') else ''),
+                   ''' +
+                   bld.env['dmapi_lib'] +
+                   NOTIFY_DEPS,
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('LOCKING',
-- 
1.9.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150708/83aded28/signature.pgp>