From 6c51cdd984f815b153bc85242c5f8794e8276445 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 5 Mar 2013 13:22:24 +0100 Subject: [PATCH] - fix fam library detection and vfs_notify_fam module build --- samba-fam.patch | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 samba-fam.patch diff --git a/samba-fam.patch b/samba-fam.patch new file mode 100644 index 0000000..1c18b60 --- /dev/null +++ b/samba-fam.patch @@ -0,0 +1,37 @@ +diff -ur samba-4.0.3/source3/modules/wscript_build samba-4.0.3-fam/source3/modules/wscript_build +--- samba-4.0.3/source3/modules/wscript_build 2012-11-13 09:03:38.000000000 +0100 ++++ samba-4.0.3-fam/source3/modules/wscript_build 2013-03-05 12:34:36.152060557 +0100 +@@ -321,6 +321,7 @@ + bld.SAMBA3_MODULE('vfs_notify_fam', + subsystem='vfs', + source=VFS_NOTIFY_FAM_SRC, ++ deps='fam', + init_function='', + internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_notify_fam'), + enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_notify_fam')) +diff -ur samba-4.0.3/source3/wscript samba-4.0.3-fam/source3/wscript +--- samba-4.0.3/source3/wscript 2013-02-05 13:25:26.000000000 +0100 ++++ samba-4.0.3-fam/source3/wscript 2013-03-05 13:04:20.084360657 +0100 +@@ -870,6 +870,12 @@ + + seteuid = False + ++ conf.CHECK_HEADERS('fam.h') ++ if not conf.CONFIG_SET('HAVE_FAM_H'): ++ Logs.warn("fam.h not found") ++ if conf.CHECK_FUNCS_IN('FAMClose', 'fam'): ++ conf.DEFINE('HAVE_FAM', 1) ++ + # + # Ensure we select the correct set of system calls on Linux. + # +@@ -1742,6 +1748,9 @@ + if conf.CONFIG_SET('HAVE_GPFS'): + default_shared_modules.extend(TO_LIST('vfs_gpfs')) + ++ if conf.CONFIG_SET('HAVE_FAM'): ++ default_shared_modules.extend(TO_LIST('vfs_notify_fam')) ++ + explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',') + explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',') + -- 2.44.0