diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-06-11 13:19:00 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-12 11:10:36 +0100 |
| commit | d7b7f134929dbd79bcd6eff2a3dd2e65d2e88204 (patch) | |
| tree | edda6428847baf5049e8811cdb4f069d826a4ee5 /meta/recipes-devtools/rpm/rpm | |
| parent | 9786663f9ce531f1f9f32deeef0276bda5604e1c (diff) | |
| download | ast2050-yocto-poky-d7b7f134929dbd79bcd6eff2a3dd2e65d2e88204.zip ast2050-yocto-poky-d7b7f134929dbd79bcd6eff2a3dd2e65d2e88204.tar.gz | |
rpm: Ensure pkgconfig deps don't stray from the package being built
Force pkg-config to only look in the install directory, and not be
able to fall back to system pkg-config directories for resolution.
(From OE-Core rev: 7afcfeb1db00c800485b2f3a89dad1ed84083979)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm')
| -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 0000000..4aba400 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-pkgconfigdeps.patch @@ -0,0 +1,34 @@ +pkgconfigdeps.sh: Change to restricting pkgconfig to the local directory + +Using PKG_CONFIG_PATH will allow pkg-config to fall back to the system paths, +we don't want this as it may lead to inaccurate results in some corner cases. + +PKG_CONFIG_LIBDIR will ensure pkg-config stays within the install directory. + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +diff -ur rpm-5.4.9.orig/scripts/pkgconfigdeps.sh rpm-5.4.9/scripts/pkgconfigdeps.sh +--- rpm-5.4.9.orig/scripts/pkgconfigdeps.sh 2009-02-13 08:13:37.000000000 -0600 ++++ rpm-5.4.9/scripts/pkgconfigdeps.sh 2012-06-07 17:35:42.730003847 -0500 +@@ -18,8 +18,8 @@ + *.pc) + # Query the dependencies of the package. + DIR=`dirname ${filename}` +- PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" +- export PKG_CONFIG_PATH ++ PKG_CONFIG_LIBDIR="$DIR:$DIR/../../share/pkgconfig" ++ export PKG_CONFIG_LIBDIR + $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do + [ -n "$n" ] || continue + # We have a dependency. Make a note that we need the pkgconfig +@@ -42,8 +42,8 @@ + [ -n "$oneshot" ] && echo "$oneshot"; oneshot="" + # Query the dependencies of the package. + DIR=`dirname ${filename}` +- PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig" +- export PKG_CONFIG_PATH ++ PKG_CONFIG_LIBDIR="$DIR:$DIR/../../share/pkgconfig" ++ export PKG_CONFIG_LIBDIR + $pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do + [ -n "$n" ] || continue + if [ -n "$r" ] && [ -n "$v" ]; then |
