From 0ba276ebad57d75a769e22414f94acbe8c177d97 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 15 Apr 2014 10:24:24 +0200 Subject: 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 Reviewed-by: Alexander Bokovoy Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu May 8 13:55:50 CEST 2014 on sn-devel-104 --- buildtools/wafadmin/Tools/perl.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'buildtools') diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py index 8f13e289271..e65ee5ceef6 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) -- cgit