Attachment 12664 Details for Bug 12395 – Patch for 4.4 and 4.5

[patch] Patch for 4.4 and 4.5

BZ12395.patch (text/plain), 1.31 KB, created by Martin Schwenke on 2016-11-15 00:23:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Schwenke

Created: 2016-11-15 00:23:23 UTC

Size: 1.31 KB

patch

obsolete

>From 4493f290e6d6385169ac2ad67ac9c124fae32cf1 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Wed, 26 Oct 2016 00:06:12 +1300
>Subject: [PATCH] build: Fix build with perl on debian sid.
>
>build: Fix build with perl on debian sid.
>
>It appears that "." is no longer in perl_inc
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12395
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>
>Autobuild-User(master): Martin Schwenke <martins@samba.org>
>Autobuild-Date(master): Sat Oct 29 09:32:37 CEST 2016 on sn-devel-144
>
>(cherry picked from commit da67acbcfe2167fce9c360a55416ab10e9537a2a)
>---
> buildtools/wafsamba/samba_perl.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>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
>-- 
>2.10.2
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 12395: 12607 | 12664