mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
buildtools: Fix code spelling
Best reviewed with: `git show --word-diff` Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Rowland Penny <rpenny@samba.org>
This commit is contained in:
parent
98c14205a0
commit
b1767d505e
@ -38,7 +38,7 @@ import os
|
|||||||
import subprocess
|
import subprocess
|
||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
|
|
||||||
# those are defaults, but can be overidden using command line
|
# these are defaults, but can be overridden using command line
|
||||||
SSH = 'ssh'
|
SSH = 'ssh'
|
||||||
USER = None
|
USER = None
|
||||||
HOST = 'localhost'
|
HOST = 'localhost'
|
||||||
|
@ -982,7 +982,7 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
|
|||||||
'''enable/disable cache of configure results'''
|
'''enable/disable cache of configure results'''
|
||||||
if enable:
|
if enable:
|
||||||
# when -C is chosen, we will use a private cache and will
|
# when -C is chosen, we will use a private cache and will
|
||||||
# not look into system includes. This roughtly matches what
|
# not look into system includes. This roughly matches what
|
||||||
# autoconf does with -C
|
# autoconf does with -C
|
||||||
cache_path = os.path.join(conf.bldnode.abspath(), '.confcache')
|
cache_path = os.path.join(conf.bldnode.abspath(), '.confcache')
|
||||||
mkdir_p(cache_path)
|
mkdir_p(cache_path)
|
||||||
|
@ -57,7 +57,7 @@ Options.OptionsContext.PRIVATE_EXTENSION_DEFAULT = PRIVATE_EXTENSION_DEFAULT
|
|||||||
|
|
||||||
|
|
||||||
def minimum_library_version(conf, libname, default):
|
def minimum_library_version(conf, libname, default):
|
||||||
'''allow override of mininum system library version'''
|
'''allow override of minimum system library version'''
|
||||||
|
|
||||||
minlist = Options.options.MINIMUM_LIBRARY_VERSION
|
minlist = Options.options.MINIMUM_LIBRARY_VERSION
|
||||||
if not minlist:
|
if not minlist:
|
||||||
|
@ -36,7 +36,7 @@ def check(self, *k, **kw):
|
|||||||
if d:
|
if d:
|
||||||
additional_dirs.append(d)
|
additional_dirs.append(d)
|
||||||
|
|
||||||
# we add the additional dirs twice: once for the test data, and again if the compilation test suceeds below
|
# we add the additional dirs twice: once for the test data, and again if the compilation test succeeds below
|
||||||
def add_options_dir(dirs, env):
|
def add_options_dir(dirs, env):
|
||||||
for x in dirs:
|
for x in dirs:
|
||||||
if not x in env.CPPPATH:
|
if not x in env.CPPPATH:
|
||||||
|
@ -132,7 +132,7 @@ def PUBLIC_HEADERS(bld, public_headers, header_path=None, public_headers_install
|
|||||||
bld.SET_BUILD_GROUP('final')
|
bld.SET_BUILD_GROUP('final')
|
||||||
|
|
||||||
if not bld.env.build_public_headers:
|
if not bld.env.build_public_headers:
|
||||||
# in this case no header munging neeeded. Used for tdb, talloc etc
|
# in this case no header munging needed. Used for tdb, talloc etc
|
||||||
public_headers_simple(bld, public_headers, header_path=header_path,
|
public_headers_simple(bld, public_headers, header_path=header_path,
|
||||||
public_headers_install=public_headers_install)
|
public_headers_install=public_headers_install)
|
||||||
return
|
return
|
||||||
|
@ -327,7 +327,7 @@ def EXPAND_VARIABLES(ctx, varstr, vars=None):
|
|||||||
|
|
||||||
env = ConfigSet.ConfigSet()
|
env = ConfigSet.ConfigSet()
|
||||||
ret = varstr
|
ret = varstr
|
||||||
# substitute on user supplied dict if avaiilable
|
# substitute on user supplied dict if available
|
||||||
if vars is not None:
|
if vars is not None:
|
||||||
for v in vars.keys():
|
for v in vars.keys():
|
||||||
env[v] = vars[v]
|
env[v] = vars[v]
|
||||||
|
@ -148,7 +148,7 @@ Build.BuildContext.AUTOCLEANUP_STALE_FILES = Utils.nada
|
|||||||
def check(self, *k, **kw):
|
def check(self, *k, **kw):
|
||||||
'''Override the waf defaults to inject --with-directory options'''
|
'''Override the waf defaults to inject --with-directory options'''
|
||||||
|
|
||||||
# match the configuration test with speficic options, for example:
|
# match the configuration test with specific options, for example:
|
||||||
# --with-libiconv -> Options.options.iconv_open -> "Checking for library iconv"
|
# --with-libiconv -> Options.options.iconv_open -> "Checking for library iconv"
|
||||||
self.validate_c(kw)
|
self.validate_c(kw)
|
||||||
|
|
||||||
@ -161,7 +161,7 @@ def check(self, *k, **kw):
|
|||||||
if d:
|
if d:
|
||||||
additional_dirs.append(d)
|
additional_dirs.append(d)
|
||||||
|
|
||||||
# we add the additional dirs twice: once for the test data, and again if the compilation test suceeds below
|
# we add the additional dirs twice: once for the test data, and again if the compilation test succeeds below
|
||||||
def add_options_dir(dirs, env):
|
def add_options_dir(dirs, env):
|
||||||
for x in dirs:
|
for x in dirs:
|
||||||
if not x in env.CPPPATH:
|
if not x in env.CPPPATH:
|
||||||
|
@ -436,7 +436,7 @@ def check_syslib_collisions(bld, tgt_list):
|
|||||||
|
|
||||||
|
|
||||||
def check_dependencies(bld, t):
|
def check_dependencies(bld, t):
|
||||||
'''check for depenencies that should be changed'''
|
'''check for dependencies that should be changed'''
|
||||||
|
|
||||||
if bld.get_tgen_by_name(t.sname + ".objlist"):
|
if bld.get_tgen_by_name(t.sname + ".objlist"):
|
||||||
return
|
return
|
||||||
|
@ -118,7 +118,7 @@ Use this with extreme care
|
|||||||
action="store_true", dest='disable_rpath_private_install', default=False)
|
action="store_true", dest='disable_rpath_private_install', default=False)
|
||||||
gr.add_option('--nonshared-binary',
|
gr.add_option('--nonshared-binary',
|
||||||
help=(
|
help=(
|
||||||
f'''Disable use of shared libaries internal to {Context.g_module.APPNAME} for the listed binaries.
|
f'''Disable use of shared libraries internal to {Context.g_module.APPNAME} for the listed binaries.
|
||||||
|
|
||||||
The resulting binaries are 'statically linked' with regard to components provided by
|
The resulting binaries are 'statically linked' with regard to components provided by
|
||||||
{Context.g_module.APPNAME}, but remain dynamically linked to (eg) libc.so and libgnutls.so
|
{Context.g_module.APPNAME}, but remain dynamically linked to (eg) libc.so and libgnutls.so
|
||||||
@ -528,7 +528,8 @@ def configure(conf):
|
|||||||
strict=True,
|
strict=True,
|
||||||
msg='Checking for __attribute__')
|
msg='Checking for __attribute__')
|
||||||
|
|
||||||
# Solaris by defauls uses draft versions of some functions unless you set _POSIX_PTHREAD_SEMANTICS
|
# Solaris by default uses draft versions of some functions unless you set
|
||||||
|
# _POSIX_PTHREAD_SEMANTICS
|
||||||
if sys.platform.startswith('sunos'):
|
if sys.platform.startswith('sunos'):
|
||||||
conf.DEFINE('_POSIX_PTHREAD_SEMANTICS', 1)
|
conf.DEFINE('_POSIX_PTHREAD_SEMANTICS', 1)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user