diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-06 17:34:31 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-06 17:34:40 +0200 |
| commit | 9f0147921189b04774fdc95c358bfedbced26068 (patch) | |
| tree | cd636f30fca047c213bc461df472e883c7335c14 /scripts/pkg-config-wrapper | |
| parent | 24e3147deca1c963d5c8dfa340c8b2559b940f64 (diff) | |
| download | ptxdist-9f0147921189b04774fdc95c358bfedbced26068.tar.gz ptxdist-9f0147921189b04774fdc95c358bfedbced26068.tar.xz | |
some more pkg-config cleanup
Remove some unused/empty variables and handle sysroot fully in the
wrapper.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/pkg-config-wrapper')
| -rwxr-xr-x | scripts/pkg-config-wrapper | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/pkg-config-wrapper b/scripts/pkg-config-wrapper index 11e586a20..77dc26c5c 100755 --- a/scripts/pkg-config-wrapper +++ b/scripts/pkg-config-wrapper @@ -4,10 +4,12 @@ basedir="$(basename "$(dirname "$(dirname "$0")")")" declare -a prefix if [ "${basedir}" = "sysroot-cross" ]; then - prefix="$(dirname "$(dirname "$(dirname "$0")")")/sysroot-target/usr" + sysroot="$(dirname "$(dirname "$(dirname "$0")")")/sysroot-target" + prefix="${sysroot}/usr" whitelist="${PKGCONFIG_WHITELIST_TARGET}" elif [ "${basedir}" = "sysroot-host" ]; then - prefix="$(dirname "$(dirname "$0")")" + sysroot="$(dirname "$(dirname "$0")")" + prefix="${sysroot}" whitelist="${PKGCONFIG_WHITELIST_HOST}" else echo "$(basename ${0}): failed to determine prefix" >&2 @@ -58,7 +60,7 @@ if [ -n "${PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT}" -a \ # remove sysroot for variables that return a path # args[${#args[@]}]="-e" - args[${#args[@]}]="s~^${SYSROOT}/~/~" + args[${#args[@]}]="s~^${sysroot}/~/~" fi check_pipe_status() { |