Attachment 11300 Details for Bug 11421 – fix for bug 11421, cherry-picked from master

[patch] fix for bug 11421, cherry-picked from master

fix-bug-11421_gpfsBuildBroken.patch (text/plain), 4.76 KB, created by Björn Baumbach on 2015-07-31 11:49:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2015-07-31 11:49:20 UTC

Size: 4.76 KB

patch

obsolete

>From 8fb188bb225f3a292bd7e2ffc60f5084a9c2a4ae Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Mon, 27 Jul 2015 12:14:37 +0200
>Subject: [PATCH 1/3] configure: add --with-gpfs option for selecting directory
> with gpfs headers
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Fix for bug #11421 part 1.
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11421
>
>Signed-off-by: BjÃ¶rn Baumbach <bb@sernet.de>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>(cherry picked from commit b9bef361d95daf0f38363acbdec9c23f094ffaca)
>---
> lib/util/wscript           | 4 ++++
> lib/util/wscript_configure | 2 +-
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/lib/util/wscript b/lib/util/wscript
>index 26b5564..953becf 100644
>--- a/lib/util/wscript
>+++ b/lib/util/wscript
>@@ -17,3 +17,7 @@ def set_options(opt):
>     opt.add_option('--without-lttng',
>                    help=("Disable lttng integration"),
>                    action='store_false', dest='enable_lttng')
>+
>+    opt.add_option('--with-gpfs',
>+                   help=("Directory under which gpfs headers are installed"),
>+                   action="store", dest='gpfs_headers_dir', default="/usr/lpp/mmfs/include/")
>diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure
>index 95a8949..e7bcbd6 100644
>--- a/lib/util/wscript_configure
>+++ b/lib/util/wscript_configure
>@@ -135,6 +135,6 @@ else:
>     conf.SET_TARGET_TYPE('lttng-ust', 'EMPTY')
>     conf.undefine('HAVE_LTTNG_TRACEF')
> 
>-conf.env['CPPPATH_GPFS'] = '/usr/lpp/mmfs/include/'
>+conf.env['CPPPATH_GPFS'] = Options.options.gpfs_headers_dir
> if conf.CHECK_HEADERS('gpfs.h', False, False, "gpfs"):
>     conf.DEFINE('HAVE_GPFS', '1')
>-- 
>2.3.6
>
>
>From 4c072ea2d59f8901dd47bf23275ea8f7f138f46e Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Mon, 27 Jul 2015 15:15:07 +0200
>Subject: [PATCH 2/3] build: fix build with gpfs support - add missing
> dependency to samba-debug
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Fix for bug #11421 part 2.
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11421
>
>Pair-programmed-with: Stefan Metzmacher <metze@samba.org>
>Signed-off-by: BjÃ¶rn Baumbach <bb@sernet.de>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>
>Autobuild-User(master): Martin Schwenke <martins@samba.org>
>Autobuild-Date(master): Wed Jul 29 13:38:59 CEST 2015 on sn-devel-104
>
>(cherry picked from commit d57e4ac3de5f53346a8d7c3f96825c1345b58f6a)
>---
> lib/util/wscript_build | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/lib/util/wscript_build b/lib/util/wscript_build
>index 1014c75..9663bb0 100755
>--- a/lib/util/wscript_build
>+++ b/lib/util/wscript_build
>@@ -30,6 +30,7 @@ bld.SAMBA_SUBSYSTEM('close-low-fd',
>                     local_include=False)
> 
> samba_debug_add_deps = ''
>+samba_debug_add_inc  = ''
> 
> if bld.CONFIG_SET('HAVE_GPFS'):
>     bld.SAMBA_SUBSYSTEM('gpfswrap',
>@@ -38,12 +39,14 @@ if bld.CONFIG_SET('HAVE_GPFS'):
>                         local_include=False,
>                         includes=bld.CONFIG_GET('CPPPATH_GPFS'))
>     samba_debug_add_deps += ' gpfswrap'
>+    samba_debug_add_inc  += bld.CONFIG_GET('CPPPATH_GPFS')
> 
> bld.SAMBA_LIBRARY('samba-debug',
>                   source='debug.c',
>                   deps='replace time-basic close-low-fd talloc socket-blocking' + samba_debug_add_deps,
>                   public_deps='systemd systemd-journal lttng-ust',
>                   local_include=False,
>+                  includes=samba_debug_add_inc,
>                   private_library=True)
> 
> bld.SAMBA_LIBRARY('socket-blocking',
>-- 
>2.3.6
>
>
>From 5aa4b869647028b579908cb8a666d1957d7a03b5 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Mon, 27 Jul 2015 13:20:43 +0200
>Subject: [PATCH 3/3] s3:wscript: fix indentation
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: BjÃ¶rn Baumbach <bb@sernet.de>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>(cherry picked from commit cef8897f45f1b231d26342688542560bbe695276)
>---
> source3/wscript | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/wscript b/source3/wscript
>index a9a7c14..4e940fa 100644
>--- a/source3/wscript
>+++ b/source3/wscript
>@@ -1634,7 +1634,7 @@ main() {
>         default_static_modules.extend(TO_LIST('charset_macosxfs'))
> 
>     if conf.CONFIG_SET('HAVE_GPFS'):
>-	default_shared_modules.extend(TO_LIST('vfs_gpfs'))
>+        default_shared_modules.extend(TO_LIST('vfs_gpfs'))
> 
>     if (conf.CONFIG_SET('HAVE_LINUX_IOCTL')
>       and conf.CONFIG_SET('HAVE_BASENAME') and conf.CONFIG_SET('HAVE_DIRNAME')):
>-- 
>2.3.6
>

Flags:

metze: review+
martins: review+

Actions: View

Attachments on bug 11421: 11300