aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-07-12 16:28:06 -0700
committerDylan Baker <dylan@pnwbakers.com>2021-07-13 16:43:14 -0700
commit20399a3e041a193e222ee856347f3774f1afad93 (patch)
treeacdb73d7a2d281cfb54921d62457c99536fb1ef7
parent4d67dd19e5b7dcec6716840d30984fa41eef55c6 (diff)
downloadmeson-20399a3e041a193e222ee856347f3774f1afad93.zip
meson-20399a3e041a193e222ee856347f3774f1afad93.tar.gz
meson-20399a3e041a193e222ee856347f3774f1afad93.tar.bz2
modules/pkgconfig: remove handling of .pcdep
Nothing uses this anymore, so don't check for it.
-rw-r--r--mesonbuild/modules/pkgconfig.py12
-rwxr-xr-xrun_unittests.py18
2 files changed, 1 insertions, 29 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
index c6eaedc..48bbc34 100644
--- a/mesonbuild/modules/pkgconfig.py
+++ b/mesonbuild/modules/pkgconfig.py
@@ -81,11 +81,6 @@ class DependenciesHelper:
if hasattr(obj, 'generated_pc'):
self._check_generated_pc_deprecation(obj)
processed_reqs.append(obj.generated_pc)
- elif hasattr(obj, 'pcdep'):
- pcdeps = mesonlib.listify(obj.pcdep)
- for d in pcdeps:
- processed_reqs.append(d.name)
- self.add_version_reqs(d.name, obj.version_reqs)
elif isinstance(obj, dependencies.PkgConfigDependency):
if obj.found():
processed_reqs.append(obj.name)
@@ -114,12 +109,7 @@ class DependenciesHelper:
processed_reqs = []
processed_cflags = []
for obj in libs:
- if hasattr(obj, 'pcdep'):
- pcdeps = mesonlib.listify(obj.pcdep)
- for d in pcdeps:
- processed_reqs.append(d.name)
- self.add_version_reqs(d.name, obj.version_reqs)
- elif hasattr(obj, 'generated_pc'):
+ if hasattr(obj, 'generated_pc'):
self._check_generated_pc_deprecation(obj)
processed_reqs.append(obj.generated_pc)
elif isinstance(obj, dependencies.PkgConfigDependency):
diff --git a/run_unittests.py b/run_unittests.py
index e8f453d..d0bdbd4 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -774,24 +774,6 @@ class InternalTests(unittest.TestCase):
kwargs = {'sources': [1, [2, [3]]]}
self.assertEqual([1, 2, 3], extract(kwargs, 'sources'))
- def test_pkgconfig_module(self):
- dummystate = mock.Mock()
- dummystate.subproject = 'dummy'
- _mock = mock.Mock(spec=mesonbuild.dependencies.ExternalDependency)
- _mock.pcdep = mock.Mock()
- _mock.pcdep.name = "some_name"
- _mock.version_reqs = []
-
- # pkgconfig dependency as lib
- deps = mesonbuild.modules.pkgconfig.DependenciesHelper(dummystate, "thislib")
- deps.add_pub_libs([_mock])
- self.assertEqual(deps.format_reqs(deps.pub_reqs), "some_name")
-
- # pkgconfig dependency as requires
- deps = mesonbuild.modules.pkgconfig.DependenciesHelper(dummystate, "thislib")
- deps.add_pub_reqs([_mock])
- self.assertEqual(deps.format_reqs(deps.pub_reqs), "some_name")
-
def _test_all_naming(self, cc, env, patterns, platform):
shr = patterns[platform]['shared']
stc = patterns[platform]['static']