[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  0ba276e wafsamba: If perl can't provide defaults, define them.
      from  50a66d5 torture3: local-messaging-read3

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0ba276ebad57d75a769e22414f94acbe8c177d97
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Apr 15 10:24:24 2014 +0200

    wafsamba: If perl can't provide defaults, define them.
    
    This should fix the installation on FreeBSD.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Thu May  8 13:55:50 CEST 2014 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafadmin/Tools/perl.py |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py
index 8f13e28..e65ee5c 100644
--- a/buildtools/wafadmin/Tools/perl.py
+++ b/buildtools/wafadmin/Tools/perl.py
@@ -101,12 +101,18 @@ def check_perl_ext_devel(conf):
 	if getattr(Options.options, 'perl_vendorarch_dir', None):
 		conf.env.PERL_VENDORARCH_DIR = Options.options.perl_vendorarch_dir
 	else:
-		conf.env.PERL_VENDORARCH_DIR = read_out('print $Config{vendorarch}')[0]
+		try:
+			conf.env.PERL_VENDORARCH_DIR = read_out('print $Config{vendorarch}')[0]
+		except IndexError:
+			conf.env.PERL_VENDORARCH_DIR = "${DATADIR}/perl5"
 
 	if getattr(Options.options, 'perl_vendorlib_dir', None):
 		conf.env.PERL_VENDORLIB_DIR = Options.options.perl_vendorlib_dir
 	else:
-		conf.env.PERL_VENDORLIB_DIR = read_out('print $Config{vendorlib}')[0]
+		try:
+			conf.env.PERL_VENDORLIB_DIR = read_out('print $Config{vendorlib}')[0]
+		except IndexError:
+			conf.env.PERL_VENDORLIB_DIR = "${LIBDIR}/perl5"
 
 def set_options(opt):
 	opt.add_option("--with-perl-binary", type="string", dest="perlbinary", help = 'Specify alternate perl binary', default=None)


-- 
Samba Shared Repository