if PKG_CONFIG_PATH is already set, pkg-config-wrapper should use these dirs too

If PKG_CONFIG_PATH is set, then prepend these paths to those generated
by the wrapper.  This allows cross-compilation using sysroots with pkgconfig
directories in non-standard locations.

This change is safer than the original patch (https://codereview.chromium.org/12320047/), which was reverted (https://codereview.chromium.org/12317063/) due to what appears to be a chromeos builder with PKG_CONFIG_PATH set to an incomplete value (should probably be unset).

Add Opera Software to the AUTHORS file


BUG=


Review URL: https://chromiumcodereview.appspot.com/12340023

git-svn-id: http://src.chromium.org/svn/trunk/src/build@184184 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
mostynb@opera.com 2013-02-22 21:45:47 +00:00
Родитель 4e125330a9
Коммит f5eca3cd1e
1 изменённых файлов: 10 добавлений и 0 удалений

Просмотреть файл

@ -11,6 +11,9 @@
# This assumption is valid for a range of sysroots, in particular: a
# LSB-compliant root filesystem mounted at the sysroot, and a board build
# directory of a Chromium OS chroot.
# Additional directories containing .pc files may be specified by setting
# the PKG_CONFIG_PATH environment variable- these will be prepended to the
# generated paths.
root="$1"
shift
@ -34,6 +37,13 @@ rewrite=`dirname $0`/rewrite_dirs.py
package=${!#}
config_path=$root/usr/$libpath/pkgconfig:$root/usr/share/pkgconfig
# prepend any paths specified by the environment
if [ -n "$PKG_CONFIG_PATH" ]
then
config_path="$PKG_CONFIG_PATH:$config_path"
fi
set -e
# Some sysroots, like the Chromium OS ones, may generate paths that are not
# relative to the sysroot. For example,