There's no need to look at the passed arguments and unset variables, we want fdo's pkgconfig behaviour when called from the pkg-config wrapper and this can be done by exporting PKG_CONFIG_FDO_SYSROOT_RULES.
Signed-off-by: Ross Burton <[email protected]> --- .../pkgconf/pkgconf/pkg-config-wrapper | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper index 695f349566d..89081672abd 100755 --- a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper +++ b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper @@ -1,16 +1,7 @@ -#!/bin/sh -# pkgconf wrapper to deal with pkg-config/pkgconf compatibility issues -# -# Copyright (C) 2015 Christopher Larson <[email protected]> -# License: MIT (see COPYING.MIT at the root of the repository for terms) +#! /bin/sh -for arg; do - case "$arg" in - --variable|--variable=*) - # pkg-config doesn't sysroot-prefix user variables - unset PKG_CONFIG_SYSROOT_DIR - ;; - esac -done +# Tell pkgconf to use pkgconfig behaviour when dealing with the sysroot to ease +# migration. +export PKG_CONFIG_FDO_SYSROOT_RULES="1" exec pkgconf "$@" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#233602): https://lists.openembedded.org/g/openembedded-core/message/233602 Mute This Topic: https://lists.openembedded.org/mt/118416245/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
