mirror of
https://github.com/samba-team/samba.git
synced 2025-02-07 01:58:28 +03:00
963ccff806
The decorator order matters in the following: """ @runonce @conf function() """ First, the @conf decorator binds the function to the configuration context and then returns the same function. The @runonce decorator then takes the output function and replaces it by another that performs caching. This new function remains in the current script and is never bound to the configuration context, so caching never occurs. The declaration would have been correct if written like this: """ @conf @runonce function() """ Yet the decorator @run_once does not keep the function name (__name__), so the annotation with @conf would fail. The straightforward approach is to remove all the incorrect @runonce occurrences. Besides that, the function Utils.run_once is already present in the Waf library, and is sufficient for the current needs of the Samba code (it caches only the first argument). Therefore samba_utils.runonce can be safely replaced by Utils.run_once, which is also present in Waf 1.8. Note: at runtime, only SETUP_BUILD_GROUPS seems to actually use caching. Signed-off-by: Thomas Nagy <tnagy@waf.io> Reviewed-by: Uri Simchoni uri@samba.org Reviewed-by: Andrew Bartlett <abartlet@samba.org>
56 lines
1.9 KiB
Python
56 lines
1.9 KiB
Python
import Utils
|
|
from Configure import conf
|
|
|
|
done = {}
|
|
|
|
@conf
|
|
def SAMBA_CHECK_PERL(conf, mandatory=True, version=(5,0,0)):
|
|
if "done" in done:
|
|
return
|
|
done["done"] = True
|
|
conf.find_program('perl', var='PERL', mandatory=mandatory)
|
|
conf.check_tool('perl')
|
|
path_perl = conf.find_program('perl')
|
|
conf.env.PERL_SPECIFIED = (conf.env.PERL != path_perl)
|
|
conf.check_perl_version(version)
|
|
|
|
def read_perl_config_var(cmd):
|
|
return Utils.to_list(Utils.cmd_output([conf.env.PERL, '-MConfig', '-e', cmd]))
|
|
|
|
def check_perl_config_var(var):
|
|
conf.start_msg("Checking for perl $Config{%s}:" % var)
|
|
try:
|
|
v = read_perl_config_var('print $Config{%s}' % var)[0]
|
|
conf.end_msg("'%s'" % (v), 'GREEN')
|
|
return v
|
|
except IndexError:
|
|
conf.end_msg(False, 'YELLOW')
|
|
pass
|
|
return None
|
|
|
|
vendor_prefix = check_perl_config_var('vendorprefix')
|
|
|
|
perl_arch_install_dir = None
|
|
if vendor_prefix == conf.env.PREFIX:
|
|
perl_arch_install_dir = check_perl_config_var('vendorarch');
|
|
if perl_arch_install_dir is None:
|
|
perl_arch_install_dir = "${LIBDIR}/perl5";
|
|
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 vendor_prefix == conf.env.PREFIX:
|
|
perl_lib_install_dir = check_perl_config_var('vendorlib');
|
|
if perl_lib_install_dir is None:
|
|
perl_lib_install_dir = "${DATADIR}/perl5";
|
|
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
|
|
|
|
perl_inc = read_perl_config_var('print "@INC"')
|
|
perl_inc.remove('.')
|
|
conf.start_msg("PERL_INC: ")
|
|
conf.end_msg("%s" % (perl_inc), 'GREEN')
|
|
conf.env.PERL_INC = perl_inc
|