Attachment 10570 Details for Bug 11026 – git-am fix for 4.2 that went into master

[patch] git-am fix for 4.2 that went into master

v42_nss_wrapper.patch (text/plain), 1.54 KB, created by Ralph Böhme on 2014-12-30 12:16:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2014-12-30 12:16:17 UTC

Size: 1.54 KB

patch

obsolete

>From 6a0395a7414916c4600d0814ff7c8777f7c494d9 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Wed, 15 Oct 2014 11:29:12 +0200
>Subject: [PATCH] nss_wrapper: check for nss.h
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=11026
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>
>Autobuild-User(master): Ralph BÃ¶hme <slow@samba.org>
>Autobuild-Date(master): Wed Oct 15 14:06:11 CEST 2014 on sn-devel-104
>
>(cherry picked from commit ee9d075ae44ca8fdfa16afe878038711641f9a0c)
>---
> lib/nss_wrapper/wscript | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/lib/nss_wrapper/wscript b/lib/nss_wrapper/wscript
>index 34026c0..78fe4cd 100644
>--- a/lib/nss_wrapper/wscript
>+++ b/lib/nss_wrapper/wscript
>@@ -9,6 +9,8 @@ def configure(conf):
>         conf.DEFINE('USING_SYSTEM_NSS_WRAPPER', 1)
>         libnss_wrapper_so_path = 'libnss_wrapper.so'
>     else:
>+        conf.CHECK_HEADERS('nss.h')
>+
>         # check HAVE_GCC_THREAD_LOCAL_STORAGE
>         conf.CHECK_CODE('''
>             __thread int tls;
>@@ -94,7 +96,7 @@ def configure(conf):
>     conf.DEFINE('NSS_WRAPPER', 1)
> 
> def build(bld):
>-    if not bld.CONFIG_SET("USING_SYSTEM_NSS_WRAPPER"):
>+    if bld.CONFIG_SET("HAVE_NSS_H") and not bld.CONFIG_SET("USING_SYSTEM_NSS_WRAPPER"):
>         # We need to do it this way or the library wont work.
>         # Using private_library=True will add symbol version which
>         # breaks preloading!
>-- 
>1.9.3
>

Flags:

asn: review+

Actions: View

Attachments on bug 11026: 10570