diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch new file mode 100644 index 0000000000..4aba400602 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | pkgconfigdeps.sh: Change to restricting pkgconfig to the local directory | ||
2 | |||
3 | Using PKG_CONFIG_PATH will allow pkg-config to fall back to the system paths, | ||
4 | we don't want this as it may lead to inaccurate results in some corner cases. | ||
5 | |||
6 | PKG_CONFIG_LIBDIR will ensure pkg-config stays within the install directory. | ||
7 | |||
8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
9 | |||
10 | diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps.sh | ||
11 | --- rpm-5.4.9.orig/scripts/pkgconfigdeps.sh 2009-02-13 08:13:37.000000000 -0600 | ||
12 | +++ rpm-5.4.9/scripts/pkgconfigdeps.sh 2012-06-07 17:35:42.730003847 -0500 | ||
13 | @@ -18,8 +18,8 @@ | ||
14 | *.pc) | ||
15 | # Query the dependencies of the package. | ||
16 | DIR=`dirname ${filename}` | ||
17 | - PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" | ||
18 | - export PKG_CONFIG_PATH | ||
19 | + PKG_CONFIG_LIBDIR="$DIR:$DIR/../../share/pkgconfig" | ||
20 | + export PKG_CONFIG_LIBDIR | ||
21 | $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do | ||
22 | [ -n "$n" ] || continue | ||
23 | # We have a dependency. Make a note that we need the pkgconfig | ||
24 | @@ -42,8 +42,8 @@ | ||
25 | [ -n "$oneshot" ] && echo "$oneshot"; oneshot="" | ||
26 | # Query the dependencies of the package. | ||
27 | DIR=`dirname ${filename}` | ||
28 | - PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" | ||
29 | - export PKG_CONFIG_PATH | ||
30 | + PKG_CONFIG_LIBDIR="$DIR:$DIR/../../share/pkgconfig" | ||
31 | + export PKG_CONFIG_LIBDIR | ||
32 | $pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do | ||
33 | [ -n "$n" ] || continue | ||
34 | if [ -n "$r" ] && [ -n "$v" ]; then | ||