aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2007-02-17 15:52:22 (GMT)
committerOlivier Thauvin <nanardon@mandriva.org>2007-02-17 15:52:22 (GMT)
commit722a2cf8bd288af87df4d8d442e49ee0d322f4c7 (patch)
tree2f1b63135c7dc92198f05f50b9b5cfe7a2da8a8a
parent0428f09f0fe52e6be53c57f0274805d555aa4320 (diff)
- really fix #285771.36
-rw-r--r--ChangeLog25
-rwxr-xr-xpkgconfigdeps.sh6
2 files changed, 29 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f72894..b5e00c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2007-02-16 18:42 nanardon
+
+ * ChangeLog, configure.ac: - 1.35
+
+2007-02-16 18:41 nanardon
+
+ * find-requires.in: - enable pkgconfig requirement
+
+2007-02-16 18:42 nanardon
+
+ * ChangeLog, configure.ac: - 1.35
+
+2007-02-16 18:41 nanardon
+
+ * find-requires.in: - enable pkgconfig requirement
+
+2007-02-13 23:52 nanardon
+
+ * pkgconfigdeps.sh: - remove misplaced and not working code
+
+2007-02-13 23:51 nanardon
+
+ * pkgconfigdeps.sh: - call pkgconfig one time all .pc file to allow
+ to find all deps #28577
+
2007-02-13 23:52 nanardon
* pkgconfigdeps.sh: - remove misplaced and not working code
diff --git a/pkgconfigdeps.sh b/pkgconfigdeps.sh
index b884205..f5eb66c 100755
--- a/pkgconfigdeps.sh
+++ b/pkgconfigdeps.sh
@@ -18,11 +18,12 @@ case $1 in
*.pc)
# Assume that this file doesn't contain useful information.
pcfiles=${pcfiles}" ${filename}"
+ PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(dirname ${filename})
;;
esac
done
# Query the dependencies of the package.
- $pkgconfig --print-provides $pcfiles 2> /dev/null | while read n r v ; do
+ PKG_CONFIG_PATH=$PKG_CONFIG_PATH $pkgconfig --print-provides $pcfiles 2> /dev/null | while read n r v ; do
# We have a dependency. Make a note that we need the pkgconfig
# tool for this package.
echo "pkgconfig($n)" "$r" "$v"
@@ -34,9 +35,10 @@ case $1 in
case "${filename}" in
*.pc)
pcfiles=${pcfiles}" ${filename}"
+ PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(dirname ${filename})
esac
done
- $pkgconfig --print-requires ${pcfiles} 2> /dev/null | while read n r v ; do
+ PKG_CONFIG_PATH=$PKG_CONFIG_PATH $pkgconfig --print-requires ${pcfiles} 2> /dev/null | while read n r v ; do
echo "pkgconfig($n)" "$r" "$v"
done
;;