Attachment 12607 Details for Bug 12395 – Proposed patch for master and other releases

[patch] Proposed patch for master and other releases

samba.git-edb109f682b296044cb4cb84bb03305a75e19c2d.patch (text/plain), 982 bytes, created by Andrew Bartlett on 2016-10-28 17:50:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2016-10-28 17:50:56 UTC

Size: 982 bytes

patch

obsolete

>From: Andrew Bartlett <abartlet@samba.org>
>Date: Wed, 26 Oct 2016 00:06:12 +0000 (+1300)
>Subject: build: Fix build with perl on debian sid.
>X-Git-Url: http://git.catalyst.net.nz/gw?p=samba.git;a=commitdiff_plain;h=edb109f682b296044cb4cb84bb03305a75e19c2d
>
>build: Fix build with perl on debian sid.
>
>It appears that "." is no longer in perl_inc
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>---
>
>diff --git a/buildtools/wafsamba/samba_perl.py b/buildtools/wafsamba/samba_perl.py
>index f2f176d..2e9a53a 100644
>--- a/buildtools/wafsamba/samba_perl.py
>+++ b/buildtools/wafsamba/samba_perl.py
>@@ -49,7 +49,8 @@ def SAMBA_CHECK_PERL(conf, mandatory=True, version=(5,0,0)):
>     conf.env.PERL_LIB_INSTALL_DIR = perl_lib_install_dir
> 
>     perl_inc = read_perl_config_var('print "@INC"')
>-    perl_inc.remove('.')
>+    if '.' in perl_inc:
>+        perl_inc.remove('.')
>     conf.start_msg("PERL_INC: ")
>     conf.end_msg("%s" % (perl_inc), 'GREEN')
>     conf.env.PERL_INC = perl_inc

Actions: View

Attachments on bug 12395: 12607 | 12664