From b88279d40d9899551574c88da215b34d4fae676e Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 3 May 2012 19:25:59 +0000 Subject: [PATCH] pkg: parse CFLAGS/LIBS/LIBS.private into fragment lists. --- parse.c | 6 +++--- pkg.h | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/parse.c b/parse.c index 2f3308a..6c4ec21 100644 --- a/parse.c +++ b/parse.c @@ -469,11 +469,11 @@ parse_file(const char *filename, FILE *f) else if (!strcasecmp(key, "Version")) pkg->version = strdup_parse(pkg, value); 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")) - pkg->libs = strdup_parse(pkg, value); + pkg->libs = parse_fragment_list(pkg, pkg->libs, value); 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")) pkg->requires = parse_deplist(pkg, value); else if (!strcasecmp(key, "Requires.private")) diff --git a/pkg.h b/pkg.h index 05cce54..08b825e 100644 --- a/pkg.h +++ b/pkg.h @@ -98,9 +98,10 @@ struct pkg_ { char *description; char *url; char *pc_filedir; - char *libs; - char *libs_private; - char *cflags; + + pkg_fragment_t *libs; + pkg_fragment_t *libs_private; + pkg_fragment_t *cflags; pkg_dependency_t *requires; pkg_dependency_t *requires_private;