From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 5 Jan 2025 17:14:34 +0000 (+0000)
Subject: build: Set PKG_CONFIG_PATH a little bit elegantly
X-Git-Tag: 0.9.30~517
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42b1694b41d579f92a8654be22cf348784e4832e;p=pakfire.git

build: Set PKG_CONFIG_PATH a little bit elegantly

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/pakfire/build.c b/src/pakfire/build.c
index 8e6c492af..393e1f1be 100644
--- a/src/pakfire/build.c
+++ b/src/pakfire/build.c
@@ -522,7 +522,6 @@ static int pakfire_build_find_pkgconfig_provides(
 
 static int pakfire_build_find_pkgconfig_requires(
 		struct pakfire_ctx* ctx, struct pakfire_file* file, struct pakfire_find_deps_ctx* deps) {
-	const char* buildroot = deps->build->buildroot;
 	struct pakfire_env* env = NULL;
 	int r;
 
@@ -550,11 +549,18 @@ static int pakfire_build_find_pkgconfig_requires(
 	};
 
 	// Tell pkg-config to look inside BUILDROOT
-	r = pakfire_env_set(env,
-			"PKG_CONFIG_PATH", "%s/usr/lib64/pkgconfig:%s/usr/lib/pkgconfig:%s/usr/share/pkgconfig",
-			buildroot, buildroot, buildroot);
-	if (r < 0)
-		goto ERROR;
+	const char* search_paths[] = {
+		"/usr/lib64/pkgconfig",
+		"/usr/lib/pkgconfig",
+		"/usr/share/pkgconfig",
+		NULL,
+	};
+
+	for (const char** search_path = search_paths; *search_path; search_path++) {
+		r = pakfire_env_append(env, "PKG_CONFIG_PATH", "%s%s", deps->build->buildroot, *search_path);
+		if (r < 0)
+			goto ERROR;
+	}
 
 	// Run pkg-config and process the output
 	r = pakfire_jail_communicate(deps->build->jail, argv, env, 0, NULL, NULL,