From b1767d505e85b4c73d41256515f859eb8f3f6b52 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 14 Mar 2023 08:53:49 +0100 Subject: [PATCH] buildtools: Fix code spelling Best reviewed with: `git show --word-diff` Signed-off-by: Andreas Schneider Reviewed-by: Rowland Penny --- buildtools/examples/run_on_target.py | 2 +- buildtools/wafsamba/samba_autoconf.py | 2 +- buildtools/wafsamba/samba_bundled.py | 2 +- buildtools/wafsamba/samba_conftests.py | 2 +- buildtools/wafsamba/samba_headers.py | 2 +- buildtools/wafsamba/samba_utils.py | 2 +- buildtools/wafsamba/samba_waf18.py | 4 ++-- buildtools/wafsamba/symbols.py | 2 +- buildtools/wafsamba/wscript | 5 +++-- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/buildtools/examples/run_on_target.py b/buildtools/examples/run_on_target.py index 79c57308ad0..0c9ac5a6a18 100755 --- a/buildtools/examples/run_on_target.py +++ b/buildtools/examples/run_on_target.py @@ -38,7 +38,7 @@ import os import subprocess 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' USER = None HOST = 'localhost' diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index f429ad2d487..75d5f4acbcc 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -982,7 +982,7 @@ def SETUP_CONFIGURE_CACHE(conf, enable): '''enable/disable cache of configure results''' if enable: # 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 cache_path = os.path.join(conf.bldnode.abspath(), '.confcache') mkdir_p(cache_path) diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index c7b7246e0d6..2300565b2e4 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -57,7 +57,7 @@ Options.OptionsContext.PRIVATE_EXTENSION_DEFAULT = PRIVATE_EXTENSION_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 if not minlist: diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py index bd309adb0dd..c5e3fc9ecf6 100644 --- a/buildtools/wafsamba/samba_conftests.py +++ b/buildtools/wafsamba/samba_conftests.py @@ -36,7 +36,7 @@ def check(self, *k, **kw): if 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): for x in dirs: if not x in env.CPPPATH: diff --git a/buildtools/wafsamba/samba_headers.py b/buildtools/wafsamba/samba_headers.py index 78f57772a82..37147a95328 100644 --- a/buildtools/wafsamba/samba_headers.py +++ b/buildtools/wafsamba/samba_headers.py @@ -132,7 +132,7 @@ def PUBLIC_HEADERS(bld, public_headers, header_path=None, public_headers_install bld.SET_BUILD_GROUP('final') 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_install=public_headers_install) return diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index a7ba2ac4d0d..39512f0ac96 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -327,7 +327,7 @@ def EXPAND_VARIABLES(ctx, varstr, vars=None): env = ConfigSet.ConfigSet() ret = varstr - # substitute on user supplied dict if avaiilable + # substitute on user supplied dict if available if vars is not None: for v in vars.keys(): env[v] = vars[v] diff --git a/buildtools/wafsamba/samba_waf18.py b/buildtools/wafsamba/samba_waf18.py index cfdceea14ca..54444b3ab68 100644 --- a/buildtools/wafsamba/samba_waf18.py +++ b/buildtools/wafsamba/samba_waf18.py @@ -148,7 +148,7 @@ Build.BuildContext.AUTOCLEANUP_STALE_FILES = Utils.nada def check(self, *k, **kw): '''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" self.validate_c(kw) @@ -161,7 +161,7 @@ def check(self, *k, **kw): if 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): for x in dirs: if not x in env.CPPPATH: diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py index 5fbc0723927..99e121c372c 100644 --- a/buildtools/wafsamba/symbols.py +++ b/buildtools/wafsamba/symbols.py @@ -436,7 +436,7 @@ def check_syslib_collisions(bld, tgt_list): 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"): return diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 9ee158b1f39..47ed3f71234 100644 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -118,7 +118,7 @@ Use this with extreme care action="store_true", dest='disable_rpath_private_install', default=False) gr.add_option('--nonshared-binary', 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 {Context.g_module.APPNAME}, but remain dynamically linked to (eg) libc.so and libgnutls.so @@ -528,7 +528,8 @@ def configure(conf): strict=True, 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'): conf.DEFINE('_POSIX_PTHREAD_SEMANTICS', 1)