diff options
| author | Andreas Schneider <asn@samba.org> | 2014-04-15 10:24:24 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2014-05-08 13:55:50 +0200 |
| commit | 0ba276ebad57d75a769e22414f94acbe8c177d97 (patch) | |
| tree | 72ad96919628a0880cad85eb50fac28cb168fd6f /buildtools | |
| parent | 50a66d588a13888a594b785c700695771bf6224d (diff) | |
| download | samba-0ba276ebad57d75a769e22414f94acbe8c177d97.tar.gz samba-0ba276ebad57d75a769e22414f94acbe8c177d97.tar.xz samba-0ba276ebad57d75a769e22414f94acbe8c177d97.zip | |
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@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
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafadmin/Tools/perl.py | 10 |
1 files changed, 8 insertions, 2 deletions
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) |