sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Revert "buildtools: Rename perl vendorarch configure option."

Browse Source 
This reverts commit 04685ff4ee.

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>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Sep  9 03:07:20 CEST 2014 on sn-devel-104
This commit is contained in:
Michael Adam 2014-09-04 12:45:48 +02:00 committed by Stefan Metzmacher
parent 0b91f7d806
commit 1f878b9986
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
buildtools/wafadmin/Tools/perl.py
View File

@ -98,17 +98,12 @@ def check_perl_ext_devel(conf):
conf.env.EXTUTILS_TYPEMAP = read_out('print "$Config{privlib}/ExtUtils/typemap"') conf.env.EXTUTILS_TYPEMAP = read_out('print "$Config{privlib}/ExtUtils/typemap"')
conf.env.perlext_PATTERN = '%s.' + read_out('print $Config{dlext}')[0] conf.env.perlext_PATTERN = '%s.' + read_out('print $Config{dlext}')[0]
if getattr(Options.options, 'perl_vendorarch_dir', None): if getattr(Options.options, 'perlarchdir', None):
conf.env.PERL_VENDORARCH_DIR = Options.options.perl_vendorarch_dir conf.env.ARCHDIR_PERL = Options.options.perlarchdir
else: else:
conf.env.PERL_VENDORARCH_DIR = read_out('print $Config{vendorarch}')[0] conf.env.ARCHDIR_PERL = read_out('print $Config{sitearch}')[0]
def set_options(opt): def set_options(opt):
opt.add_option("--with-perl-binary", type="string", dest="perlbinary", help = 'Specify alternate perl binary', default=None) opt.add_option("--with-perl-binary", type="string", dest="perlbinary", help = 'Specify alternate perl binary', default=None)
opt.add_option("--with-perl-archdir", type="string", dest="perlarchdir", help = 'Specify directory where to install arch specific files', default=None)
opt.add_option("--with-perl-vendorarch",
type="string",
dest="perl_vendorarch_dir",
help = ('Specify directory where to install arch specific files'),
default=None)