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

pkg: parse CFLAGS/LIBS/LIBS.private into fragment lists.

pull/15/head
William Pitcock 2012-05-03 19:25:59 +00:00
parent 82420d0c5c
commit b88279d40d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
parse.c
View File

@ -469,11 +469,11 @@ parse_file(const char *filename, FILE *f)
else if (!strcasecmp(key, "Version")) else if (!strcasecmp(key, "Version"))
pkg->version = strdup_parse(pkg, value); pkg->version = strdup_parse(pkg, value);
else if (!strcasecmp(key, "CFLAGS")) else if (!strcasecmp(key, "CFLAGS"))
pkg->cflags = strdup_parse(pkg, value); pkg->cflags = parse_fragment_list(pkg, pkg->cflags, value);
else if (!strcasecmp(key, "LIBS")) else if (!strcasecmp(key, "LIBS"))
pkg->libs = strdup_parse(pkg, value); pkg->libs = parse_fragment_list(pkg, pkg->libs, value);
else if (!strcasecmp(key, "LIBS.private")) else if (!strcasecmp(key, "LIBS.private"))
pkg->libs_private = strdup_parse(pkg, value); pkg->libs_private = parse_fragment_list(pkg, pkg->libs_private, value);
else if (!strcasecmp(key, "Requires")) else if (!strcasecmp(key, "Requires"))
pkg->requires = parse_deplist(pkg, value); pkg->requires = parse_deplist(pkg, value);
else if (!strcasecmp(key, "Requires.private")) else if (!strcasecmp(key, "Requires.private"))

7
pkg.h
View File

@ -98,9 +98,10 @@ struct pkg_ {
char *description; char *description;
char *url; char *url;
char *pc_filedir; char *pc_filedir;
char *libs;
char *libs_private; pkg_fragment_t *libs;
char *cflags; pkg_fragment_t *libs_private;
pkg_fragment_t *cflags;
pkg_dependency_t *requires; pkg_dependency_t *requires;
pkg_dependency_t *requires_private; pkg_dependency_t *requires_private;