diff options
| author | Michael Adam <obnox@samba.org> | 2014-09-04 12:45:32 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-11-17 21:21:13 +0100 |
| commit | a3a75d7d55479f111336a3ef73beabea4317dc19 (patch) | |
| tree | ed5412285b8e3e4dfe058dd0e6e8114a06e3890e /buildtools | |
| parent | 3b4dc6619aab0cac8b80090c150d352ab031246c (diff) | |
| download | samba-a3a75d7d55479f111336a3ef73beabea4317dc19.tar.gz | |
Revert "wafsamba: If perl can't provide defaults, define them."
This reverts commit 0ba276ebad57d75a769e22414f94acbe8c177d97.
We are reverting buildtools/wafadmin/Tools/perl.py back to upstream state.
Everything special is now in buildtools/wafsamba/samba_perl.py.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 42990ca3c8fa5752280840ea202a537915680b7d)
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafadmin/Tools/perl.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py index e65ee5ceef6..8f13e289271 100644 --- a/buildtools/wafadmin/Tools/perl.py +++ b/buildtools/wafadmin/Tools/perl.py @@ -101,18 +101,12 @@ 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: - try: - conf.env.PERL_VENDORARCH_DIR = read_out('print $Config{vendorarch}')[0] - except IndexError: - conf.env.PERL_VENDORARCH_DIR = "${DATADIR}/perl5" + conf.env.PERL_VENDORARCH_DIR = read_out('print $Config{vendorarch}')[0] if getattr(Options.options, 'perl_vendorlib_dir', None): conf.env.PERL_VENDORLIB_DIR = Options.options.perl_vendorlib_dir else: - try: - conf.env.PERL_VENDORLIB_DIR = read_out('print $Config{vendorlib}')[0] - except IndexError: - conf.env.PERL_VENDORLIB_DIR = "${LIBDIR}/perl5" + conf.env.PERL_VENDORLIB_DIR = read_out('print $Config{vendorlib}')[0] def set_options(opt): opt.add_option("--with-perl-binary", type="string", dest="perlbinary", help = 'Specify alternate perl binary', default=None) |