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

pkg: implement pkg-config.pc as a builtin

pull/15/head
William Pitcock 2012-05-05 22:00:47 -05:00
parent 7352f14025
commit 1bf5da3ba4
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg.c
View File

@ -248,6 +248,12 @@ pkg_get_comparator(pkg_dependency_t *pkgdep)
return "???"; return "???";
} }
static pkg_t pkg_config_virtual = {
.id = "pkg-config",
.realname = "pkg-config",
.version = PKG_PKGCONFIG_VERSION_EQUIV,
};
/* /*
* pkg_verify_dependency(pkgdep, flags) * pkg_verify_dependency(pkgdep, flags)
* *
@ -257,18 +263,22 @@ pkg_get_comparator(pkg_dependency_t *pkgdep)
pkg_t * pkg_t *
pkg_verify_dependency(pkg_dependency_t *pkgdep, unsigned int flags, unsigned int *eflags) pkg_verify_dependency(pkg_dependency_t *pkgdep, unsigned int flags, unsigned int *eflags)
{ {
pkg_t *pkg; pkg_t *pkg = &pkg_config_virtual;
if (eflags != NULL) if (eflags != NULL)
*eflags = PKG_ERRF_OK; *eflags = PKG_ERRF_OK;
pkg = pkg_find(pkgdep->package, flags); /* pkg-config package name is special cased. */
if (pkg == NULL) if (strcasecmp(pkgdep->package, "pkg-config"))
{ {
if (eflags != NULL) pkg = pkg_find(pkgdep->package, flags);
*eflags |= PKG_ERRF_PACKAGE_NOT_FOUND; if (pkg == NULL)
{
if (eflags != NULL)
*eflags |= PKG_ERRF_PACKAGE_NOT_FOUND;
return NULL; return NULL;
}
} }
pkg->id = strdup(pkgdep->package); pkg->id = strdup(pkgdep->package);