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

main: switch to using apk-style master dependency merge strategy

pull/1/merge
William Pitcock 2011-07-25 01:03:35 -05:00
parent a3f2a47136
commit 8e46a165c2
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
main.c
View File

@ -49,6 +49,13 @@ print_libs(pkg_t *pkg, void *unused)
printf("%s ", pkg->libs); printf("%s ", pkg->libs);
} }
static void
print_modversion(pkg_t *pkg, void *unused)
{
if (pkg->version != NULL)
printf("%s\n", pkg->version);
}
typedef struct pkg_queue_ { typedef struct pkg_queue_ {
struct pkg_queue_ *prev, *next; struct pkg_queue_ *prev, *next;
const char *package; const char *package;
@ -72,40 +79,34 @@ pkg_queue_walk(pkg_queue_t *head)
{ {
int wanted_something = 0; int wanted_something = 0;
pkg_queue_t *pkgq; pkg_queue_t *pkgq;
pkg_t world = (pkg_t){
.realname = "virtual"
};
foreach_list_entry(head, pkgq) foreach_list_entry(head, pkgq)
{ {
pkg_t *pkg; world.requires = parse_deplist(&world, pkgq->package);
}
pkg = pkg_find(pkgq->package); if (want_modversion)
if (pkg) {
{ wanted_something = 0;
if (want_modversion) want_cflags = 0;
{ want_libs = 0;
wanted_something = 0;
want_cflags = 0;
want_libs = 0;
printf("%s\n", pkg->version); pkg_traverse(&world, print_modversion, NULL);
} }
if (want_cflags) if (want_cflags)
{ {
wanted_something++; wanted_something++;
pkg_traverse(pkg, print_cflags, NULL); pkg_traverse(&world, print_cflags, NULL);
} }
if (want_libs) if (want_libs)
{ {
wanted_something++; wanted_something++;
pkg_traverse(pkg, print_libs, NULL); pkg_traverse(&world, print_libs, NULL);
}
}
else
{
fprintf(stderr, "dependency '%s' could not be satisfied, see PKG_CONFIG_PATH.\n", pkgq->package);
return EXIT_FAILURE;
}
} }
if (wanted_something) if (wanted_something)