aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>2016-10-07 12:03:09 -0400
committerGuillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>2016-10-16 11:06:17 -0400
commit9429183c1d3ba6f41eb0d5f84b0ca6ed35363b9d (patch)
treee7e8cfb095778612b90da4201208447a53d95457
parentd9da74e0751c87ccc23aaf6e333122df9bca4148 (diff)
downloadmeson-9429183c1d3ba6f41eb0d5f84b0ca6ed35363b9d.zip
meson-9429183c1d3ba6f41eb0d5f84b0ca6ed35363b9d.tar.gz
meson-9429183c1d3ba6f41eb0d5f84b0ca6ed35363b9d.tar.bz2
pkgconfig: Fix typo in 'Libs.private'
It's no different from 'Libs', so we specify as well the directory.
-rw-r--r--mesonbuild/modules/pkgconfig.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
index cf190aa..883f2c4 100644
--- a/mesonbuild/modules/pkgconfig.py
+++ b/mesonbuild/modules/pkgconfig.py
@@ -63,9 +63,6 @@ class PkgConfigModule:
'Requires.private: {}\n'.format(' '.join(priv_reqs)))
if len(conflicts) > 0:
ofile.write('Conflicts: {}\n'.format(' '.join(conflicts)))
- if len(priv_libs) > 0:
- ofile.write(
- 'Libraries.private: {}\n'.format(' '.join(priv_libs)))
ofile.write('Libs: -L${libdir}')
msg = 'Library target {0!r} has {1!r} set. Compilers ' \
'may not find it from its \'-l{2}\' linker flag in the ' \
@@ -80,6 +77,9 @@ class PkgConfigModule:
mlog.log(mlog.red('WARNING:'), msg.format(l.name, 'name_suffix', lname, pcfile))
ofile.write(' -l{} '.format(lname))
ofile.write('\n')
+ if len(priv_libs) > 0:
+ ofile.write(
+ 'Libs.private: -L${libdir} {}\n'.format(' '.join(priv_libs)))
ofile.write('Cflags:')
for h in subdirs:
if h == '.':