Attachment 15551 Details for Bug 14140 – additional patch for 4.11

[patch] additional patch for 4.11

v4-11-additional.patch (text/plain), 2.02 KB, created by Andreas Schneider on 2019-10-16 11:28:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2019-10-16 11:28:16 UTC

Size: 2.02 KB

patch

obsolete

>From 44d4c2a5b5068db70d5379b060a583e5795124e6 Mon Sep 17 00:00:00 2001
>From: Isaac Boukris <iboukris@gmail.com>
>Date: Tue, 15 Oct 2019 13:52:42 +0300
>Subject: [PATCH 1/2] nsswitch: Link stress-nss-libwbclient against pthread
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14140
>
>Signed-off-by: Isaac Boukris <iboukris@gmail.com>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>(cherry picked from commit d473f1e38c2822746030516269b4d70032cf9b2e)
>---
> nsswitch/wscript_build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
>index 6acc4a19b9b..861ed2f23bf 100644
>--- a/nsswitch/wscript_build
>+++ b/nsswitch/wscript_build
>@@ -20,7 +20,7 @@ bld.SAMBA_BINARY('nsstest',
> if bld.CONFIG_SET('HAVE_PTHREAD'):
>     bld.SAMBA_BINARY('stress-nss-libwbclient',
> 		     source='stress-nss-libwbclient.c',
>-		     deps='wbclient',
>+		     deps='wbclient pthread',
> 		     install=False
> 		     )
> 
>-- 
>2.23.0
>
>
>From 4a721b79f3f6fc8c8cfa604860ebe5b4fb8a5c26 Mon Sep 17 00:00:00 2001
>From: Isaac Boukris <iboukris@gmail.com>
>Date: Tue, 15 Oct 2019 17:01:48 +0300
>Subject: [PATCH 2/2] s3:libsmb: Link libsmb against pthread
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14140
>
>Signed-off-by: Isaac Boukris <iboukris@gmail.com>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>(cherry picked from commit 7259197bf716f8b81dea74beefe6ee3b1239f172)
>---
> source3/libsmb/wscript | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/source3/libsmb/wscript b/source3/libsmb/wscript
>index d9e933e9e9f..febff9df7fc 100644
>--- a/source3/libsmb/wscript
>+++ b/source3/libsmb/wscript
>@@ -16,6 +16,7 @@ def build(bld):
>                               libsmb_xattr.c
>                               libsmb_setget.c''',
>                        public_deps='''
>+                                   pthread
>                                    talloc
>                                    smbconf
>                                    libsmb
>-- 
>2.23.0
>

Flags:

metze: review+

Actions: View

Attachments on bug 14140: 15492 | 15493 | 15542 | 15551 | 15552 | 15561