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

libpkgconf: fragment: track terminating fragments like -Wl,--end-group 

Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
master
Ariadne Conill 2025-03-05 15:36:56 -08:00
parent 6ec7df4d19
commit 4f78e44959
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libpkgconf/fragment.c
View File

@ -81,6 +81,20 @@ pkgconf_fragment_should_munge(const char *string, const char *sysroot_dir)
return false; return false;
} }
static inline bool
pkgconf_fragment_is_terminus(const char *string)
{
static const struct pkgconf_fragment_check check_fragments[] = {
{"-Wl,--end-group", 15},
};
for (size_t i = 0; i < PKGCONF_ARRAY_SIZE(check_fragments); i++)
if (!strncmp(string, check_fragments[i].token, check_fragments[i].len))
return true;
return false;
}
static inline bool static inline bool
pkgconf_fragment_is_special(const char *string) pkgconf_fragment_is_special(const char *string)
{ {
@ -175,6 +189,22 @@ pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const
if (*string == '\0') if (*string == '\0')
return; return;
if (list->tail != NULL && list->tail->data != NULL &&
!(client->flags & PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS))
{
pkgconf_fragment_t *parent = list->tail->data;
/* only attempt to merge 'special' fragments together */
if (!parent->type && parent->data != NULL &&
pkgconf_fragment_is_unmergeable(parent->data) &&
!(parent->flags & PKGCONF_PKG_FRAGF_TERMINATED))
{
target = &parent->children;
parent->flags |= PKGCONF_PKG_FRAGF_TERMINATED;
PKGCONF_TRACE(client, "adding fragment as child to list @%p", target);
}
}
if (strlen(string) > 1 && !pkgconf_fragment_is_special(string)) if (strlen(string) > 1 && !pkgconf_fragment_is_special(string))
{ {
frag = calloc(1, sizeof(pkgconf_fragment_t)); frag = calloc(1, sizeof(pkgconf_fragment_t));
@ -186,19 +216,6 @@ pkgconf_fragment_add(const pkgconf_client_t *client, pkgconf_list_t *list, const
} }
else else
{ {
if (list->tail != NULL && list->tail->data != NULL &&
!(client->flags & PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS))
{
pkgconf_fragment_t *parent = list->tail->data;
/* only attempt to merge 'special' fragments together */
if (!parent->type && parent->data != NULL && pkgconf_fragment_is_unmergeable(parent->data))
{
target = &parent->children;
PKGCONF_TRACE(client, "adding fragment as child to list @%p", target);
}
}
frag = calloc(1, sizeof(pkgconf_fragment_t)); frag = calloc(1, sizeof(pkgconf_fragment_t));
frag->type = 0; frag->type = 0;

3
libpkgconf/libpkgconf.h
View File

@ -96,8 +96,11 @@ struct pkgconf_fragment_ {
char *data; char *data;
pkgconf_list_t children; pkgconf_list_t children;
unsigned int flags;
}; };
#define PKGCONF_PKG_FRAGF_TERMINATED 0x1
struct pkgconf_dependency_ { struct pkgconf_dependency_ {
pkgconf_node_t iter; pkgconf_node_t iter;