From f9101659bc46401ad412d3132ba4fe09d06fec91 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 26 Aug 2016 12:14:32 -0500 Subject: [PATCH] pkg: add support for parsing Provides: entries --- libpkgconf/libpkgconf.h | 1 + libpkgconf/pkg.c | 1 + main.c | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h index a762f2b..a45ea88 100644 --- a/libpkgconf/libpkgconf.h +++ b/libpkgconf/libpkgconf.h @@ -98,6 +98,7 @@ struct pkgconf_pkg_ { pkgconf_list_t requires; pkgconf_list_t requires_private; pkgconf_list_t conflicts; + pkgconf_list_t provides; pkgconf_list_t vars; diff --git a/libpkgconf/pkg.c b/libpkgconf/pkg.c index c7eade3..e298073 100644 --- a/libpkgconf/pkg.c +++ b/libpkgconf/pkg.c @@ -241,6 +241,7 @@ static const pkgconf_pkg_parser_keyword_pair_t pkgconf_pkg_parser_keyword_funcs[ {"LIBS", pkgconf_pkg_parser_fragment_func, offsetof(pkgconf_pkg_t, libs)}, {"LIBS.private", pkgconf_pkg_parser_fragment_func, offsetof(pkgconf_pkg_t, libs_private)}, {"Name", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, realname)}, + {"Provides", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, provides)}, {"Requires", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, requires)}, {"Requires.private", pkgconf_pkg_parser_dependency_func, offsetof(pkgconf_pkg_t, requires_private)}, {"Version", pkgconf_pkg_parser_tuple_func, offsetof(pkgconf_pkg_t, version)}, diff --git a/main.c b/main.c index 61b2551..c83850e 100644 --- a/main.c +++ b/main.c @@ -253,7 +253,6 @@ print_requires_private(pkgconf_pkg_t *pkg) static void print_provides(pkgconf_pkg_t *pkg) { -#ifdef NOTYET pkgconf_node_t *node; PKGCONF_FOREACH_LIST_ENTRY(pkg->provides.head, node) @@ -267,7 +266,6 @@ print_provides(pkgconf_pkg_t *pkg) printf("\n"); } -#endif printf("%s = %s\n", pkg->id, pkg->version); }