wafsamba: If perl can't provide defaults, define them.
authorAndreas Schneider <asn@samba.org>
Tue, 15 Apr 2014 08:24:24 +0000 (10:24 +0200)
committerAndreas Schneider <asn@cryptomilk.org>
Thu, 8 May 2014 11:55:50 +0000 (13:55 +0200)
This should fix the installation on FreeBSD.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu May  8 13:55:50 CEST 2014 on sn-devel-104

buildtools/wafadmin/Tools/perl.py

index 8f13e2892714b6a6f745a8a9e47ceb110548d34a..e65ee5ceef63aba04076d16d2ab5051b23aacf8b 100644 (file)
@@ -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)