Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Xavier Claessens 2020-10-12 16:02:54 -04:00 committed by Jussi Pakkanen
parent 66d3747efe
commit 0c95d92404
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mesonbuild/modules/pkgconfig.py
View File

@ -173,7 +173,7 @@ class DependenciesHelper:
for t in link_whole_targets: for t in link_whole_targets:
self._add_link_whole(t, public) self._add_link_whole(t, public)
# And finally its external dependencies # And finally its external dependencies
add_libs(external_deps) self.add_priv_libs(external_deps)
def _add_link_whole(self, t, public): def _add_link_whole(self, t, public):
# Don't include static libraries that we link_whole. But we still need to # Don't include static libraries that we link_whole. But we still need to

3
run_unittests.py
View File

@ -6105,7 +6105,8 @@ class LinuxlikeTests(BasePlatformTests):
# See common/47 pkgconfig-gen/meson.build for description of the case this test # See common/47 pkgconfig-gen/meson.build for description of the case this test
with open(os.path.join(privatedir1, 'simple2.pc')) as f: with open(os.path.join(privatedir1, 'simple2.pc')) as f:
content = f.read() 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: with open(os.path.join(privatedir1, 'simple3.pc')) as f:
content = f.read() content = f.read()