diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-17 00:26:50 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-18 23:48:33 +0200 |
| commit | 34c28dc92cb4f28e32e633297e4b8a737228aae5 (patch) | |
| tree | dbe99c4d0d76eca3b08797a751d1b81ce05fd928 /mesonbuild/modules/pkgconfig.py | |
| parent | 84a3e459a8618956eb3364900d2bd522a70b7fe7 (diff) | |
| download | meson-34c28dc92cb4f28e32e633297e4b8a737228aae5.zip meson-34c28dc92cb4f28e32e633297e4b8a737228aae5.tar.gz meson-34c28dc92cb4f28e32e633297e4b8a737228aae5.tar.bz2 | |
holders: remove unholder
Diffstat (limited to 'mesonbuild/modules/pkgconfig.py')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 13af3a6..f42c1e6 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os, types +import os from pathlib import PurePath from .. import build @@ -22,7 +22,9 @@ from .. import mesonlib from .. import mlog from . import ModuleReturnValue from . import ExtensionModule -from ..interpreterbase import permittedKwargs, FeatureNew, FeatureNewKwargs +from ..interpreterbase import permittedKwargs, FeatureNew, FeatureNewKwargs, TYPE_var, TYPE_kwargs + +import typing as T already_warned_objs = set() @@ -75,7 +77,7 @@ class DependenciesHelper: def _process_reqs(self, reqs): '''Returns string names of requirements''' processed_reqs = [] - for obj in mesonlib.unholder(mesonlib.listify(reqs)): + for obj in mesonlib.listify(reqs): if not isinstance(obj, str): FeatureNew.single_use('pkgconfig.generate requirement from non-string object', '0.46.0', self.state.subproject) if hasattr(obj, 'generated_pc'): @@ -108,14 +110,13 @@ class DependenciesHelper: def add_cflags(self, cflags): self.cflags += mesonlib.stringlistify(cflags) - def _process_libs(self, libs, public): - libs = mesonlib.unholder(mesonlib.listify(libs)) + def _process_libs(self, libs, public: bool): + libs = mesonlib.listify(libs) libs = [x.get_preferred_library() if isinstance(x, build.BothLibraries) else x for x in libs] processed_libs = [] processed_reqs = [] processed_cflags = [] for obj in libs: - shared_library_only = getattr(obj, 'shared_library_only', False) if hasattr(obj, 'pcdep'): pcdeps = mesonlib.listify(obj.pcdep) for d in pcdeps: @@ -488,7 +489,7 @@ class PkgConfigModule(ExtensionModule): FeatureNew.single_use('pkgconfig.generate implicit version keyword', '0.46.0', state.subproject) elif len(args) == 1: FeatureNew.single_use('pkgconfig.generate optional positional argument', '0.46.0', state.subproject) - mainlib = getattr(args[0], 'held_object', args[0]) + mainlib = args[0] if not isinstance(mainlib, (build.StaticLibrary, build.SharedLibrary)): raise mesonlib.MesonException('Pkgconfig_gen first positional argument must be a library object') default_name = mainlib.name |