Attachment 11927 Details for Bug 11798 – git-am fix for 4.4.0 and 4.3.next

[patch] git-am fix for 4.4.0 and 4.3.next

fix-without-quota-4x.patch (text/plain), 1.53 KB, created by Uri Simchoni on 2016-03-17 04:39:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Uri Simchoni

Created: 2016-03-17 04:39:37 UTC

Size: 1.53 KB

patch

obsolete

>From 2577666008a7d05049c85cd0a187c595113fa024 Mon Sep 17 00:00:00 2001
>From: Uri Simchoni <uri@samba.org>
>Date: Wed, 16 Mar 2016 20:20:02 +0200
>Subject: [PATCH] build: fix build when --without-quota specified
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11798
>
>Signed-off-by: Uri Simchoni <uri@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit 228ab3466d0e5af46313de200b5b976d46838378)
>---
> source3/wscript | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript b/source3/wscript
>index f159d54..52f5876 100644
>--- a/source3/wscript
>+++ b/source3/wscript
>@@ -1374,6 +1374,7 @@ main() {
>     conf.CHECK_FUNCS_IN('getspnam', 'security')
>     conf.CHECK_FUNCS_IN('getspnam', 'sec')
> 
>+    legacy_quota_libs = ''
>     if Options.options.with_quotas:
>         # For quotas on Veritas VxFS filesystems
>         conf.CHECK_HEADERS('sys/fs/vx_quota.h')
>@@ -1458,7 +1459,6 @@ main() {
>         # check if Legacy quota code can be brought in
>         # if standard interfaces are not supported
>         #
>-        legacy_quota_libs = ''
>         if not conf.CONFIG_SET('WITH_QUOTAS'):
>             if host_os.rfind('sunos5') > -1:
>                 conf.DEFINE('SUNOS5', '1')
>@@ -1476,7 +1476,7 @@ main() {
>                             addmain=False)
>             if not conf.CONFIG_SET('WITH_QUOTAS'):
>                 legacy_quota_libs = ''
>-        conf.env['legacy_quota_libs'] = legacy_quota_libs
>+    conf.env['legacy_quota_libs'] = legacy_quota_libs
> 
>     #
>     # cluster support (CTDB)
>-- 
>2.5.0
>

Flags:

jra: review+

Actions: View

Attachments on bug 11798: 11927