Fix automatic pkgconfig dependencies.

The pkgconfig package was added as "provides" instead of a
dependency when .pc files were in a package.

diff --git a/tools/find-provides b/tools/find-provides
index 8a3e3cb3a83e0140e3e752f8de35bda36dfe6d72..0be2de7b48132ab3268e1ef5896e00d361db342e 100755 (executable)
--- a/tools/find-provides
+++ b/tools/find-provides
@@ -81,9 +81,6 @@ if [ -n "${pkgconfig}" -a -x "${pkgconfig}" ]; then
                        # We have a dependency.  Make a note that we need the pkgconfig
                        # tool for this package.
                        echo "pkgconfig(${n}) ${r} ${v}"
-
-                       # The dependency on the pkgconfig package itself.
-                       echo "pkgconfig"
                done
        done | sort -u
 fi

diff --git a/tools/find-requires b/tools/find-requires
index 044c59fef507dd13c390f1d790ae1376089923b1..9a98c324cbf8b652c51553910aac9e9f28678aee 100755 (executable)
--- a/tools/find-requires
+++ b/tools/find-requires
@@ -142,6 +142,9 @@ fi
 pkgconfig=$(which pkg-config)
 if [ -n "${pkgconfig}" -a -x "${pkgconfig}" ]; then
        for file in ${pkgconfig_files}; do
+               # The dependency for the pkgconfig package itself.
+               echo "pkgconfig"
+
                ${pkgconfig} --print-requires --print-requires-private "${file}" 2> /dev/null | while read n r v ; do
                        echo "pkgconfig(${n})" "${r}" "${v}"
                done