Attachment 13974 Details for Bug 13277 – patch from master for 4.8, 4.7 and 4.6

[patch] patch from master for 4.8, 4.7 and 4.6

patch (text/plain), 1.70 KB, created by Guenther Deschner on 2018-02-22 21:00:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2018-02-22 21:00:23 UTC

Size: 1.70 KB

patch

obsolete

>From ef2f67b5e5cd74f23ec9e6a5ee3a831570c7d40f Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
>Date: Mon, 15 Jan 2018 23:20:39 +0100
>Subject: [PATCH] build: fix libceph-common detection
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13277
>
>Guenther
>
>Signed-off-by: Guenther Deschner <gd@samba.org>
>Reviewed-by: David Disseldorp <ddiss@samba.org>
>
>Autobuild-User(master): GÃ¼nther Deschner <gd@samba.org>
>Autobuild-Date(master): Thu Feb 22 19:30:12 CET 2018 on sn-devel-144
>
>(cherry picked from commit 6a59619844e0def505a6bfa778c17721c062e0ee)
>---
> source3/wscript | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript b/source3/wscript
>index 253505c82ee..a444f028ed9 100644
>--- a/source3/wscript
>+++ b/source3/wscript
>@@ -1547,11 +1547,13 @@ main() {
>         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'
>+    else:
>+        conf.env['LIBPATH_CEPH-COMMON'] = Options.options.LIBDIR + '/ceph'
> 
>     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)):
>+        conf.CHECK_LIB('cephfs', shlib=True)):
>+        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 ceph-common',
>-- 
>2.14.3
>

Flags:

ddiss: review+

Actions: View

Attachments on bug 13277: 13966 | 13974