The branch, master has been updated
via 1f878b9 Revert "buildtools: Rename perl vendorarch configure
option."
via 0b91f7d Revert "buildtools: Add perl vendorlib configure option."
via 42990ca Revert "wafsamba: If perl can't provide defaults, define
them."
via c5dd2f1 Revert "wafsamba: Fail with error message if perl doesn't
provide valid dirs."
via ee21487 pidl/wscript: remove --with-perl-* options
from cd87d9f torture: basic FSCTL_SET_ZERO_DATA tests
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1f878b9986523ce9e35dd74ae3c201f4e55f66f3
Author: Michael Adam <ob...@samba.org>
Date: Thu Sep 4 12:45:48 2014 +0200
Revert "buildtools: Rename perl vendorarch configure option."
This reverts commit 04685ff4eed9535769d6a5feee7353f1796a4389.
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 <ob...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
Autobuild-User(master): Stefan Metzmacher <me...@samba.org>
Autobuild-Date(master): Tue Sep 9 03:07:20 CEST 2014 on sn-devel-104
commit 0b91f7d806b9d18881edb8df981a9eeb057580e5
Author: Michael Adam <ob...@samba.org>
Date: Thu Sep 4 12:45:40 2014 +0200
Revert "buildtools: Add perl vendorlib configure option."
This reverts commit 48f0183dbeddd7bdf333a40fe0d3e1c7e7fe00f2.
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 <ob...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 42990ca3c8fa5752280840ea202a537915680b7d
Author: Michael Adam <ob...@samba.org>
Date: Thu Sep 4 12:45:32 2014 +0200
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 <ob...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit c5dd2f18dd09b08758fc68a4aac10cf01d775c85
Author: Michael Adam <ob...@samba.org>
Date: Thu Sep 4 12:45:21 2014 +0200
Revert "wafsamba: Fail with error message if perl doesn't provide valid
dirs."
This reverts commit 2637890ef42a238093f0f3cbdda0d621d5f9b2e2.
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 <ob...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit ee2148754e2e2604ac918343fa8769a25523eb49
Author: Stefan Metzmacher <me...@samba.org>
Date: Tue Aug 26 21:33:05 2014 +0200
pidl/wscript: remove --with-perl-* options
These are not needed anymore as we have useful defaults now.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Michael Adam <ob...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafadmin/Tools/perl.py | 51 +++---------------------------------
pidl/wscript | 2 +-
2 files changed, 6 insertions(+), 47 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafadmin/Tools/perl.py
b/buildtools/wafadmin/Tools/perl.py
index 0f34e79..a6787a8 100644
--- a/buildtools/wafadmin/Tools/perl.py
+++ b/buildtools/wafadmin/Tools/perl.py
@@ -98,53 +98,12 @@ def check_perl_ext_devel(conf):
conf.env.EXTUTILS_TYPEMAP = read_out('print
"$Config{privlib}/ExtUtils/typemap"')
conf.env.perlext_PATTERN = '%s.' + read_out('print $Config{dlext}')[0]
- def try_any(keys):
- for k in keys:
- conf.start_msg("Checking for perl $Config{%s}:" % k)
- try:
- v = read_out('print $Config{%s}' % k)[0]
- conf.end_msg("'%s'" % (v), 'GREEN')
- return v
- except IndexError:
- conf.end_msg(False, 'YELLOW')
- pass
- return None
-
- perl_arch_install_dir = None
- if getattr(Options.options, 'perl_arch_install_dir', None):
- perl_arch_install_dir = Options.options.perl_arch_install_dir
- if perl_arch_install_dir is None:
- perl_arch_install_dir = try_any(['vendorarch', 'sitearch',
'archlib'])
- if perl_arch_install_dir is None:
- conf.fatal('No perl arch install directory autodetected.' +
- 'Please define it with
--with-perl-arch-install-dir.')
- conf.start_msg("PERL_ARCH_INSTALL_DIR: ")
- conf.end_msg("'%s'" % (perl_arch_install_dir), 'GREEN')
- conf.env.PERL_ARCH_INSTALL_DIR = perl_arch_install_dir
-
- perl_lib_install_dir = None
- if getattr(Options.options, 'perl_lib_install_dir', None):
- perl_lib_install_dir = Options.options.perl_lib_install_dir
- if perl_lib_install_dir is None:
- perl_lib_install_dir = try_any(['vendorlib', 'sitelib',
'privlib'])
- if perl_lib_install_dir is None:
- conf.fatal('No perl lib install directory autodetected. ' +
- 'Please define it with --with-perl-lib-install-dir.')
- conf.start_msg("PERL_LIB_INSTALL_DIR: ")
- conf.end_msg("'%s'" % (perl_lib_install_dir), 'GREEN')
- conf.env.PERL_LIB_INSTALL_DIR = perl_lib_install_dir
+ if getattr(Options.options, 'perlarchdir', None):
+ conf.env.ARCHDIR_PERL = Options.options.perlarchdir
+ else:
+ conf.env.ARCHDIR_PERL = read_out('print $Config{sitearch}')[0]
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-archdir", type="string",
dest="perlarchdir", help = 'Specify directory where to install arch specific
files', default=None)
- opt.add_option("--with-perl-arch-install-dir",
- type="string",
- dest="perl_arch_install_dir",
- help = ('Specify directory where to install arch
specific files'),
- default=None)
-
- opt.add_option("--with-perl-lib-install-dir",
- type="string",
- dest="perl_lib_install_dir",
- help = ('Specify directory where to install vendor
specific files'),
- default=None)
diff --git a/pidl/wscript b/pidl/wscript
index 0d7626c..27cb230 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -26,7 +26,7 @@ def check_system_perl_module(conf, module, version=None):
return True
def set_options(opt):
- opt.tool_options('perl')
+ return
def configure(conf):
# Check if perl(Parse::Yapp::Driver) is available.
--
Samba Shared Repository
