]>
Commit | Line | Data |
---|---|---|
89792766 MT |
1 | commit 6230230c96c4961d6e5e7aed176d4859dd744b03 |
2 | Author: Michael Tremer <michael.tremer@ipfire.org> | |
3 | Date: Sat Mar 17 13:12:57 2012 +0100 | |
4 | ||
5 | Fix automatic pkgconfig dependencies. | |
6 | ||
7 | The pkgconfig package was added as "provides" instead of a | |
8 | dependency when .pc files were in a package. | |
9 | ||
10 | diff --git a/tools/find-provides b/tools/find-provides | |
11 | index 8a3e3cb..0be2de7 100755 | |
12 | --- a/tools/find-provides | |
13 | +++ b/tools/find-provides | |
14 | @@ -81,9 +81,6 @@ if [ -n "${pkgconfig}" -a -x "${pkgconfig}" ]; then | |
15 | # We have a dependency. Make a note that we need the pkgconfig | |
16 | # tool for this package. | |
17 | echo "pkgconfig(${n}) ${r} ${v}" | |
18 | - | |
19 | - # The dependency on the pkgconfig package itself. | |
20 | - echo "pkgconfig" | |
21 | done | |
22 | done | sort -u | |
23 | fi | |
24 | diff --git a/tools/find-requires b/tools/find-requires | |
25 | index 044c59f..9a98c32 100755 | |
26 | --- a/tools/find-requires | |
27 | +++ b/tools/find-requires | |
28 | @@ -142,6 +142,9 @@ fi | |
29 | pkgconfig=$(which pkg-config) | |
30 | if [ -n "${pkgconfig}" -a -x "${pkgconfig}" ]; then | |
31 | for file in ${pkgconfig_files}; do | |
32 | + # The dependency for the pkgconfig package itself. | |
33 | + echo "pkgconfig" | |
34 | + | |
35 | ${pkgconfig} --print-requires --print-requires-private "${file}" 2> /dev/null | while read n r v ; do | |
36 | echo "pkgconfig(${n})" "${r}" "${v}" | |
37 | done |