summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2020-10-12 16:02:54 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2020-10-17 15:53:46 +0300
commit0c95d92404cfc5cebb32c886484946a8a42f6e79 (patch)
tree0997a454ce51b6cff212a7ddd3863bb4692c4f8c
parent66d3747efef9343ce2d98d24fe9be47c2432a941 (diff)
downloadmeson-0c95d92404cfc5cebb32c886484946a8a42f6e79.tar.gz
pkgconfig: InternalDependency's ext_deps should be private by default
This fixes a regression introduced by https://github.com/mesonbuild/meson/pull/7488. InternalDependency's ext_deps previously where simply ignored, but that PR has effect to add many more public Requires in generated pc files.
-rw-r--r--mesonbuild/modules/pkgconfig.py2
-rwxr-xr-xrun_unittests.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
index 38c96a9ca..968e1eede 100644
--- a/mesonbuild/modules/pkgconfig.py
+++ b/mesonbuild/modules/pkgconfig.py
@@ -173,7 +173,7 @@ class DependenciesHelper:
for t in link_whole_targets:
self._add_link_whole(t, public)
# And finally its external dependencies
- add_libs(external_deps)
+ self.add_priv_libs(external_deps)
def _add_link_whole(self, t, public):
# Don't include static libraries that we link_whole. But we still need to
diff --git a/run_unittests.py b/run_unittests.py
index 8f1c52a68..03cd82b83 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -6105,7 +6105,8 @@ class LinuxlikeTests(BasePlatformTests):
# See common/47 pkgconfig-gen/meson.build for description of the case this test
with open(os.path.join(privatedir1, 'simple2.pc')) as f:
content = f.read()
- self.assertIn('Libs: -L${libdir} -lsimple2 -lz -lsimple1', content)
+ self.assertIn('Libs: -L${libdir} -lsimple2 -lsimple1', content)
+ self.assertIn('Libs.private: -lz', content)
with open(os.path.join(privatedir1, 'simple3.pc')) as f:
content = f.read()