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

fragment: special-case `-framework` handling and implement merge-back strategy for -F flags (closes #47)

feature/tap-sh
William Pitcock 2013-03-15 17:29:07 -05:00
parent 4381d4609b
commit 8fbecafdae
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fragment.c
View File

@ -23,7 +23,7 @@ pkg_fragment_add(pkg_list_t *list, const char *string)
frag = calloc(sizeof(pkg_fragment_t), 1); frag = calloc(sizeof(pkg_fragment_t), 1);
if (*string == '-' && strncmp(string, "-lib:", 5)) if (*string == '-' && strncmp(string, "-lib:", 5) && strncmp(string, "-framework", 10))
{ {
frag->type = *(string + 1); frag->type = *(string + 1);
frag->data = strdup(string + 2); frag->data = strdup(string + 2);
@ -56,10 +56,34 @@ pkg_fragment_lookup(pkg_list_t *list, pkg_fragment_t *base)
return NULL; return NULL;
} }
bool static inline bool
pkg_fragment_can_merge_back(pkg_fragment_t *base)
{
if (base->type == 'F')
return false;
return true;
}
static inline bool
pkg_fragment_can_merge(pkg_fragment_t *base)
{
if (!strncmp(base->data, "-framework", 10))
return false;
return true;
}
static inline pkg_fragment_t *
pkg_fragment_exists(pkg_list_t *list, pkg_fragment_t *base) pkg_fragment_exists(pkg_list_t *list, pkg_fragment_t *base)
{ {
return pkg_fragment_lookup(list, base) != NULL; if (!pkg_fragment_can_merge_back(base))
return NULL;
if (!pkg_fragment_can_merge(base))
return NULL;
return pkg_fragment_lookup(list, base);
} }
void void
@ -67,8 +91,10 @@ pkg_fragment_copy(pkg_list_t *list, pkg_fragment_t *base)
{ {
pkg_fragment_t *frag; pkg_fragment_t *frag;
if ((frag = pkg_fragment_lookup(list, base)) != NULL) if ((frag = pkg_fragment_exists(list, base)) != NULL)
pkg_fragment_delete(list, frag); pkg_fragment_delete(list, frag);
else if (!pkg_fragment_can_merge_back(base) && (pkg_fragment_lookup(list, base) != NULL))
return;
frag = calloc(sizeof(pkg_fragment_t), 1); frag = calloc(sizeof(pkg_fragment_t), 1);

1
pkg.h
View File

@ -160,7 +160,6 @@ void pkg_fragment_parse(pkg_list_t *list, pkg_list_t *vars, const char *value);
void pkg_fragment_add(pkg_list_t *list, const char *string); void pkg_fragment_add(pkg_list_t *list, const char *string);
void pkg_fragment_copy(pkg_list_t *list, pkg_fragment_t *base); void pkg_fragment_copy(pkg_list_t *list, pkg_fragment_t *base);
void pkg_fragment_delete(pkg_list_t *list, pkg_fragment_t *node); void pkg_fragment_delete(pkg_list_t *list, pkg_fragment_t *node);
bool pkg_fragment_exists(pkg_list_t *head, pkg_fragment_t *base);
void pkg_fragment_free(pkg_list_t *list); void pkg_fragment_free(pkg_list_t *list);
/* fileio.c */ /* fileio.c */