From a42f265c0793e10a239ce43ed80b5041b745edb4 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Thu, 21 Dec 2017 02:18:50 -0600
Subject: [PATCH] libpkgconf: pkg: include system libdir and includedir search
 paths as variables in builtin packages (closes #165)

---
 libpkgconf/pkg.c | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/libpkgconf/pkg.c b/libpkgconf/pkg.c
index 6918d6d..5357b06 100644
--- a/libpkgconf/pkg.c
+++ b/libpkgconf/pkg.c
@@ -884,15 +884,24 @@ static pkgconf_pkg_t pkg_config_virtual = {
 	.flags = PKGCONF_PKG_PROPF_STATIC,
 	.vars = {
 		.head = &(pkgconf_node_t){
-			.prev = NULL,
-			.next = NULL,
+			.next = &(pkgconf_node_t){
+				.next = &(pkgconf_node_t){
+					.data = &(pkgconf_tuple_t){
+						.key = "pc_system_libdirs",
+						.value = SYSTEM_LIBDIR,
+					}
+				},
+				.data = &(pkgconf_tuple_t){
+					.key = "pc_system_includedirs",
+					.value = SYSTEM_INCLUDEDIR,
+				}
+			},
 			.data = &(pkgconf_tuple_t){
 				.key = "pc_path",
 				.value = PKG_DEFAULT_PATH,
 			},
-		},
-		.tail = NULL,
-	},
+		}
+	}
 };
 
 static pkgconf_pkg_t pkgconf_virtual = {
@@ -904,14 +913,23 @@ static pkgconf_pkg_t pkgconf_virtual = {
 	.flags = PKGCONF_PKG_PROPF_STATIC,
 	.vars = {
 		.head = &(pkgconf_node_t){
-			.prev = NULL,
-			.next = NULL,
+			.next = &(pkgconf_node_t){
+				.next = &(pkgconf_node_t){
+					.data = &(pkgconf_tuple_t){
+						.key = "pc_system_libdirs",
+						.value = SYSTEM_LIBDIR,
+					}
+				},
+				.data = &(pkgconf_tuple_t){
+					.key = "pc_system_includedirs",
+					.value = SYSTEM_INCLUDEDIR,
+				}
+			},
 			.data = &(pkgconf_tuple_t){
 				.key = "pc_path",
 				.value = PKG_DEFAULT_PATH,
 			},
-		},
-		.tail = NULL,
+		}
 	},
 };