Attachment 13957 Details for Bug 13250 – cherry-pick for 4.7.next

[patch] cherry-pick for 4.7.next

bso13250_ceph_statx_with_libcephfs_path_47t.patch (text/plain), 2.31 KB, created by David Disseldorp on 2018-02-12 12:38:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Disseldorp

Created: 2018-02-12 12:38:18 UTC

Size: 2.31 KB

patch

obsolete

>From 7981ca44a8ccd4c365629a3f78121fc29c9e6443 Mon Sep 17 00:00:00 2001
>From: David Disseldorp <ddiss@suse.de>
>Date: Thu, 20 Jul 2017 11:10:57 +0200
>Subject: [PATCH] build: fix ceph_statx check when configured with
> libcephfs_dir
>
>When configured with a custom libcephfs_dir, the ceph_statx check fails
>to link. This is due to the location of the ceph-common dependency,
>which is installed under a ceph subdirectory.
>
>ceph/build > make DESTDIR=./inst install
>...
>ceph/build > find inst/|grep -e /libcephfs -e /libceph-common
>inst/usr/local/lib64/ceph/libceph-common.so.0
>inst/usr/local/lib64/ceph/libceph-common.so
>inst/usr/local/lib64/libcephfs.so.2.0.0
>inst/usr/local/lib64/libcephfs.so.2
>inst/usr/local/lib64/libcephfs.so
>inst/usr/local/include/cephfs/libcephfs.h
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=13250
>
>Signed-off-by: David Disseldorp <ddiss@suse.de>
>Reviewed-by: Jeff Layton <jlayton@samba.org>
>
>(cherry picked from commit ff7df3d3f5259362a6bb6780d6b532e57e89681d)
>---
> source3/wscript | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript b/source3/wscript
>index aa1a7b3defc..6823e0aad24 100644
>--- a/source3/wscript
>+++ b/source3/wscript
>@@ -1582,11 +1582,16 @@ main() {
>     if Options.options.libcephfs_dir:
>         conf.env['CPPPATH_CEPHFS'] = Options.options.libcephfs_dir + '/include'
>         conf.env['LIBPATH_CEPHFS'] = Options.options.libcephfs_dir + '/lib'
>+        conf.env['LIBPATH_CEPH-COMMON'] = Options.options.libcephfs_dir + '/lib/ceph'
> 
>-    if conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and conf.CHECK_LIB('cephfs', shlib=True) and Options.options.with_cephfs:
>+    if (Options.options.with_cephfs and
>+        conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and
>+        conf.CHECK_LIB('cephfs', shlib=True) and
>+        conf.CHECK_LIB('ceph-common', shlib=True)):
>         if Options.options.with_acl_support:
>             conf.DEFINE('HAVE_CEPH', '1')
>-            if conf.CHECK_FUNCS_IN('ceph_statx', 'cephfs', headers='cephfs/libcephfs.h'):
>+            if conf.CHECK_FUNCS_IN('ceph_statx', 'cephfs ceph-common',
>+                                   headers='cephfs/libcephfs.h'):
>                 conf.DEFINE('HAVE_CEPH_STATX', '1')
>         else:
>             Logs.warn("ceph support disabled due to --without-acl-support")
>-- 
>2.13.6
>

Flags:

jlayton: review+

Actions: View

Attachments on bug 13250: 13945 | 13946 | 13956 | 13957