From: Ross Burton <ross.burton@arm.com>
Date: Fri, 20 Mar 2026 12:27:28 +0000 (+0000)
Subject: pkgconf: minimise wrapper
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4425f6f02586330b4e47f8a35156e216b4aa0ffd;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

pkgconf: minimise wrapper

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 <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper b/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
index 695f349566..89081672ab 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 <chris_larson@mentor.com>
-# 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 "$@"