diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch index 5d182ad9fe..656de86d70 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch | |||
@@ -9,14 +9,14 @@ Upstream-Status: Inappropriate [configuration] | |||
9 | 9 | ||
10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
11 | 11 | ||
12 | Index: rpm-5.4.14/scripts/pkgconfigdeps.sh | 12 | Index: rpm/scripts/pkgconfigdeps.sh |
13 | =================================================================== | 13 | =================================================================== |
14 | --- rpm-5.4.14.orig/scripts/pkgconfigdeps.sh | 14 | --- rpm.orig/scripts/pkgconfigdeps.sh |
15 | +++ rpm-5.4.14/scripts/pkgconfigdeps.sh | 15 | +++ rpm/scripts/pkgconfigdeps.sh |
16 | @@ -18,8 +18,8 @@ case $1 in | 16 | @@ -18,8 +18,8 @@ case $1 in |
17 | *.pc) | 17 | *.pc) |
18 | # Query the dependencies of the package. | 18 | # Query the dependencies of the package. |
19 | DIR=`dirname ${filename}` | 19 | DIR=$(dirname ${filename}) |
20 | - PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" | 20 | - PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" |
21 | - export PKG_CONFIG_PATH | 21 | - export PKG_CONFIG_PATH |
22 | + PKG_CONFIG_LIBDIR="$DIR:$DIR/../../share/pkgconfig" | 22 | + PKG_CONFIG_LIBDIR="$DIR:$DIR/../../share/pkgconfig" |
@@ -27,7 +27,7 @@ Index: rpm-5.4.14/scripts/pkgconfigdeps.sh | |||
27 | @@ -42,8 +42,8 @@ case $1 in | 27 | @@ -42,8 +42,8 @@ case $1 in |
28 | [ -n "$oneshot" ] && echo "$oneshot"; oneshot="" | 28 | [ -n "$oneshot" ] && echo "$oneshot"; oneshot="" |
29 | # Query the dependencies of the package. | 29 | # Query the dependencies of the package. |
30 | DIR=`dirname ${filename}` | 30 | DIR=$(dirname ${filename}) |
31 | - PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" | 31 | - PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" |
32 | - export PKG_CONFIG_PATH | 32 | - export PKG_CONFIG_PATH |
33 | + PKG_CONFIG_LIBDIR="$DIR:$DIR/../../share/pkgconfig" | 33 | + PKG_CONFIG_LIBDIR="$DIR:$DIR/../../share/pkgconfig" |