diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-12-30 18:38:51 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-14 14:42:16 +0000 |
commit | bbddf83f65f490c88130d794c53ff9e4c45d0693 (patch) | |
tree | bec599b6bbb2c0022f922c97601cb621e4b3f3b9 /meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch | |
parent | 27d56eeebd8197e359aae0a7ccac74cb55ff794d (diff) | |
download | poky-bbddf83f65f490c88130d794c53ff9e4c45d0693.tar.gz |
rpm: remove 5.x recipe
(From OE-Core rev: d0365f35303db3595688a6e5290677e02a72c54e)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch deleted file mode 100644 index 656de86d70..0000000000 --- a/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
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 | Upstream-Status: Inappropriate [configuration] | ||
9 | |||
10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
11 | |||
12 | Index: rpm/scripts/pkgconfigdeps.sh | ||
13 | =================================================================== | ||
14 | --- rpm.orig/scripts/pkgconfigdeps.sh | ||
15 | +++ rpm/scripts/pkgconfigdeps.sh | ||
16 | @@ -18,8 +18,8 @@ case $1 in | ||
17 | *.pc) | ||
18 | # Query the dependencies of the package. | ||
19 | DIR=$(dirname ${filename}) | ||
20 | - PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" | ||
21 | - export PKG_CONFIG_PATH | ||
22 | + PKG_CONFIG_LIBDIR="$DIR:$DIR/../../share/pkgconfig" | ||
23 | + export PKG_CONFIG_LIBDIR | ||
24 | $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do | ||
25 | [ -n "$n" ] || continue | ||
26 | # We have a dependency. Make a note that we need the pkgconfig | ||
27 | @@ -42,8 +42,8 @@ case $1 in | ||
28 | [ -n "$oneshot" ] && echo "$oneshot"; oneshot="" | ||
29 | # Query the dependencies of the package. | ||
30 | DIR=$(dirname ${filename}) | ||
31 | - PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" | ||
32 | - export PKG_CONFIG_PATH | ||
33 | + PKG_CONFIG_LIBDIR="$DIR:$DIR/../../share/pkgconfig" | ||
34 | + export PKG_CONFIG_LIBDIR | ||
35 | $pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do | ||
36 | [ -n "$n" ] || continue | ||
37 | if [ -n "$r" ] && [ -n "$v" ]; then | ||