Blame samba-4.8.0-ceph.patch
|
Günther Deschner |
cba93b4 |
From ebae8df5e4b955f235cdeb629e99d32d35766d65 Mon Sep 17 00:00:00 2001
|
|
Günther Deschner |
cba93b4 |
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
|
|
Günther Deschner |
cba93b4 |
Date: Mon, 15 Jan 2018 23:20:39 +0100
|
|
Günther Deschner |
cba93b4 |
Subject: [PATCH] FIXME: build: fix libceph-common detection
|
|
Günther Deschner |
cba93b4 |
|
|
Günther Deschner |
cba93b4 |
Guenther
|
|
Günther Deschner |
cba93b4 |
|
|
Günther Deschner |
cba93b4 |
Signed-off-by: Guenther Deschner <gd@samba.org>
|
|
Günther Deschner |
cba93b4 |
---
|
|
Günther Deschner |
cba93b4 |
source3/wscript | 2 ++
|
|
Günther Deschner |
cba93b4 |
1 file changed, 2 insertions(+)
|
|
Günther Deschner |
cba93b4 |
|
|
Günther Deschner |
cba93b4 |
diff --git a/source3/wscript b/source3/wscript
|
|
Günther Deschner |
cba93b4 |
index 0f8fe5452da..4eba0103be8 100644
|
|
Günther Deschner |
cba93b4 |
--- a/source3/wscript
|
|
Günther Deschner |
cba93b4 |
+++ b/source3/wscript
|
|
Günther Deschner |
cba93b4 |
@@ -1540,6 +1540,8 @@ main() {
|
|
Günther Deschner |
cba93b4 |
conf.env['CPPPATH_CEPHFS'] = Options.options.libcephfs_dir + '/include'
|
|
Günther Deschner |
cba93b4 |
conf.env['LIBPATH_CEPHFS'] = Options.options.libcephfs_dir + '/lib'
|
|
Günther Deschner |
cba93b4 |
conf.env['LIBPATH_CEPH-COMMON'] = Options.options.libcephfs_dir + '/lib/ceph'
|
|
Günther Deschner |
cba93b4 |
+ else:
|
|
Günther Deschner |
cba93b4 |
+ conf.env['LIBPATH_CEPH-COMMON'] = Options.options.LIBDIR + '/ceph'
|
|
Günther Deschner |
cba93b4 |
|
|
Günther Deschner |
cba93b4 |
if (Options.options.with_cephfs and
|
|
Günther Deschner |
cba93b4 |
conf.CHECK_HEADERS('cephfs/libcephfs.h', False, False, 'cephfs') and
|
|
Günther Deschner |
cba93b4 |
--
|
|
Günther Deschner |
cba93b4 |
2.14.3
|
|
Günther Deschner |
cba93b4 |
|