aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies
diff options
context:
space:
mode:
authorChristian Clauss <cclauss@me.com>2021-10-01 00:03:23 +0200
committerEli Schwartz <eschwartz93@gmail.com>2021-10-10 16:12:25 -0400
commita5020857f31ad6d03bc7c0019551cc28b9e5aad5 (patch)
treefdf9e08b2c37877e44fb4cdf91cc2ee45c868e6a /mesonbuild/dependencies
parent32b7cbd4a7cd8cffb47c5465301141eaad599eaa (diff)
downloadmeson-a5020857f31ad6d03bc7c0019551cc28b9e5aad5.zip
meson-a5020857f31ad6d03bc7c0019551cc28b9e5aad5.tar.gz
meson-a5020857f31ad6d03bc7c0019551cc28b9e5aad5.tar.bz2
Fix typos discovered by codespell
Diffstat (limited to 'mesonbuild/dependencies')
-rw-r--r--mesonbuild/dependencies/base.py2
-rw-r--r--mesonbuild/dependencies/boost.py6
-rw-r--r--mesonbuild/dependencies/cuda.py2
-rw-r--r--mesonbuild/dependencies/factory.py2
-rw-r--r--mesonbuild/dependencies/misc.py4
-rw-r--r--mesonbuild/dependencies/qt.py6
6 files changed, 11 insertions, 11 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index 86e88a8..02ef30c 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -187,7 +187,7 @@ class Dependency(HoldableObject):
raise RuntimeError('Unreachable code in partial_dependency called')
def _add_sub_dependency(self, deplist: T.Iterable[T.Callable[[], 'Dependency']]) -> bool:
- """Add an internal depdency from a list of possible dependencies.
+ """Add an internal dependency from a list of possible dependencies.
This method is intended to make it easier to add additional
dependencies to another dependency internally.
diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
index 038ea17..aadf3f8 100644
--- a/mesonbuild/dependencies/boost.py
+++ b/mesonbuild/dependencies/boost.py
@@ -240,7 +240,7 @@ class BoostLibraryFile():
def fix_python_name(self, tags: T.List[str]) -> T.List[str]:
# Handle the boost_python naming madeness.
# See https://github.com/mesonbuild/meson/issues/4788 for some distro
- # specific naming variantions.
+ # specific naming variations.
other_tags = [] # type: T.List[str]
# Split the current modname into the base name and the version
@@ -320,7 +320,7 @@ class BoostLibraryFile():
elif vscrt in ['/MTd', '-MTd']:
return (self.runtime_static or not self.static) and self.runtime_debug
- mlog.warning(f'Boost: unknow vscrt tag {vscrt}. This may cause the compilation to fail. Please consider reporting this as a bug.', once=True)
+ mlog.warning(f'Boost: unknown vscrt tag {vscrt}. This may cause the compilation to fail. Please consider reporting this as a bug.', once=True)
return True
def get_compiler_args(self) -> T.List[str]:
@@ -405,7 +405,7 @@ class BoostDependency(SystemDependency):
The machine file values are defaulted to the environment values.
"""
- # XXX: if we had a TypedDict we woudn't need this
+ # XXX: if we had a TypedDict we wouldn't need this
incdir = props.get('boost_includedir')
assert incdir is None or isinstance(incdir, str)
libdir = props.get('boost_librarydir')
diff --git a/mesonbuild/dependencies/cuda.py b/mesonbuild/dependencies/cuda.py
index bdd2f50..d9b69c5 100644
--- a/mesonbuild/dependencies/cuda.py
+++ b/mesonbuild/dependencies/cuda.py
@@ -199,7 +199,7 @@ class CudaDependency(SystemDependency):
return None
def _read_toolkit_version_txt(self, path: str) -> T.Optional[str]:
- # Read 'version.txt' at the root of the CUDA Toolkit directory to determine the tookit version
+ # Read 'version.txt' at the root of the CUDA Toolkit directory to determine the toolkit version
version_file_path = os.path.join(path, 'version.txt')
try:
with open(version_file_path, encoding='utf-8') as version_file:
diff --git a/mesonbuild/dependencies/factory.py b/mesonbuild/dependencies/factory.py
index 048e3bc..9346abe 100644
--- a/mesonbuild/dependencies/factory.py
+++ b/mesonbuild/dependencies/factory.py
@@ -63,7 +63,7 @@ class DependencyFactory:
:methods: An ordered list of DependencyMethods. This is the order
dependencies will be returned in unless they are removed by the
_process_method function
- :*_name: This will overwrite the name passed to the coresponding class.
+ :*_name: This will overwrite the name passed to the corresponding class.
For example, if the name is 'zlib', but cmake calls the dependency
'Z', then using `cmake_name='Z'` will pass the name as 'Z' to cmake.
:*_class: A *type* or callable that creates a class, and has the
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index daa7dff..7c384f6 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -432,7 +432,7 @@ class CursesSystemDependency(SystemDependency):
v_minor, _ = self.clib_compiler.get_define('PDC_VER_MINOR', f'#include <{header}>', env, [], [self])
self.version = f'{v_major}.{v_minor}'
- # Check the version if possible, emit a wraning if we can't
+ # Check the version if possible, emit a warning if we can't
req = kwargs.get('version')
if req:
if self.version:
@@ -589,7 +589,7 @@ python3_factory = DependencyFactory(
system_class=Python3DependencySystem,
# There is no version number in the macOS version number
framework_name='Python',
- # There is a python in /System/Library/Frameworks, but thats python 2.x,
+ # There is a python in /System/Library/Frameworks, but that's python 2.x,
# Python 3 will always be in /Library
extra_kwargs={'paths': ['/Library/Frameworks']},
)
diff --git a/mesonbuild/dependencies/qt.py b/mesonbuild/dependencies/qt.py
index 4eef71e..699f912 100644
--- a/mesonbuild/dependencies/qt.py
+++ b/mesonbuild/dependencies/qt.py
@@ -113,7 +113,7 @@ class QtExtraFrameworkDependency(ExtraFrameworkDependency):
class _QtBase:
- """Mixin class for shared componenets between PkgConfig and Qmake."""
+ """Mixin class for shared components between PkgConfig and Qmake."""
link_args: T.List[str]
clib_compiler: 'Compiler'
@@ -239,8 +239,8 @@ class QmakeQtDependency(_QtBase, ConfigToolDependency, metaclass=abc.ABCMeta):
_QtBase.__init__(self, name, kwargs)
self.tools = [f'qmake-{self.qtname}', 'qmake']
- # Add additional constraits that the Qt version is met, but preserve
- # any version requrements the user has set as well. For exmaple, if Qt5
+ # Add additional constraints that the Qt version is met, but preserve
+ # any version requrements the user has set as well. For example, if Qt5
# is requested, add "">= 5, < 6", but if the user has ">= 5.6", don't
# lose that.
kwargs = kwargs.copy()