dcbaker
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tuple: use ${pc_sysrootdir} instead of client->sysroot_dir where relevant

bsdstubs-errno
Ariadne Conill 2022-06-26 19:35:19 +00:00
parent 7fa632a658
commit 72e429ae70
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libpkgconf/tuple.c
View File

@ -330,15 +330,19 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
* *
* Finally, we call pkgconf_path_relocate() to clean the path of spurious elements. * Finally, we call pkgconf_path_relocate() to clean the path of spurious elements.
*/ */
const char *sysroot_dir = pkgconf_tuple_find(client, vars, "pc_sysrootdir");
if (sysroot_dir == NULL)
sysroot_dir = client->sysroot_dir;
if (*buf == '/' && if (*buf == '/' &&
client->sysroot_dir != NULL && sysroot_dir != NULL &&
strcmp(client->sysroot_dir, "/") != 0 && strcmp(sysroot_dir, "/") != 0 &&
strlen(buf) > strlen(client->sysroot_dir) && strlen(buf) > strlen(sysroot_dir) &&
strstr(buf + strlen(client->sysroot_dir), client->sysroot_dir) != NULL) strstr(buf + strlen(sysroot_dir), sysroot_dir) != NULL)
{ {
char cleanpath[PKGCONF_ITEM_SIZE]; char cleanpath[PKGCONF_ITEM_SIZE];
pkgconf_strlcpy(cleanpath, buf + strlen(client->sysroot_dir), sizeof cleanpath); pkgconf_strlcpy(cleanpath, buf + strlen(sysroot_dir), sizeof cleanpath);
pkgconf_path_relocate(cleanpath, sizeof cleanpath); pkgconf_path_relocate(cleanpath, sizeof cleanpath);
return strdup(cleanpath); return strdup(cleanpath);