ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

libpkgconf: pkg: include system libdir and includedir search paths as variables in builtin packages (closes #165)

pull/173/head
William Pitcock 2017-12-21 02:18:50 -06:00
parent 8a9b7d59df
commit a42f265c07
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libpkgconf/pkg.c
View File

@ -884,15 +884,24 @@ static pkgconf_pkg_t pkg_config_virtual = {
.flags = PKGCONF_PKG_PROPF_STATIC, .flags = PKGCONF_PKG_PROPF_STATIC,
.vars = { .vars = {
.head = &(pkgconf_node_t){ .head = &(pkgconf_node_t){
.prev = NULL, .next = &(pkgconf_node_t){
.next = NULL, .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){ .data = &(pkgconf_tuple_t){
.key = "pc_path", .key = "pc_path",
.value = PKG_DEFAULT_PATH, .value = PKG_DEFAULT_PATH,
}, },
}, }
.tail = NULL, }
},
}; };
static pkgconf_pkg_t pkgconf_virtual = { static pkgconf_pkg_t pkgconf_virtual = {
@ -904,14 +913,23 @@ static pkgconf_pkg_t pkgconf_virtual = {
.flags = PKGCONF_PKG_PROPF_STATIC, .flags = PKGCONF_PKG_PROPF_STATIC,
.vars = { .vars = {
.head = &(pkgconf_node_t){ .head = &(pkgconf_node_t){
.prev = NULL, .next = &(pkgconf_node_t){
.next = NULL, .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){ .data = &(pkgconf_tuple_t){
.key = "pc_path", .key = "pc_path",
.value = PKG_DEFAULT_PATH, .value = PKG_DEFAULT_PATH,
}, },
}, }
.tail = NULL,
}, },
}; };