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

cli: implement --fragment-filter (closes #167)

pull/173/head
William Pitcock 2018-02-28 13:00:53 -06:00
parent ca4349655c
commit 2156a74afc
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cli/main.c
View File

@ -74,6 +74,7 @@ static int maximum_traverse_depth = 2000;
static size_t maximum_package_count = 0; static size_t maximum_package_count = 0;
static char *want_variable = NULL; static char *want_variable = NULL;
static char *want_fragment_filter = NULL;
FILE *error_msgout = NULL; FILE *error_msgout = NULL;
FILE *logfile_out = NULL; FILE *logfile_out = NULL;
@ -123,6 +124,9 @@ filter_cflags(const pkgconf_client_t *client, const pkgconf_fragment_t *frag, vo
if (!(want_flags & PKG_KEEP_SYSTEM_CFLAGS) && pkgconf_fragment_has_system_dir(client, frag)) if (!(want_flags & PKG_KEEP_SYSTEM_CFLAGS) && pkgconf_fragment_has_system_dir(client, frag))
return false; return false;
if (want_fragment_filter != NULL && (strchr(want_fragment_filter, frag->type) == NULL || !frag->type))
return false;
if (frag->type == 'I') if (frag->type == 'I')
got_flags = PKG_CFLAGS_ONLY_I; got_flags = PKG_CFLAGS_ONLY_I;
else else
@ -141,6 +145,9 @@ filter_libs(const pkgconf_client_t *client, const pkgconf_fragment_t *frag, void
if (!(want_flags & PKG_KEEP_SYSTEM_LIBS) && pkgconf_fragment_has_system_dir(client, frag)) if (!(want_flags & PKG_KEEP_SYSTEM_LIBS) && pkgconf_fragment_has_system_dir(client, frag))
return false; return false;
if (want_fragment_filter != NULL && (strchr(want_fragment_filter, frag->type) == NULL || !frag->type))
return false;
switch (frag->type) switch (frag->type)
{ {
case 'L': got_flags = PKG_LIBS_ONLY_LDPATH; break; case 'L': got_flags = PKG_LIBS_ONLY_LDPATH; break;
@ -668,7 +675,10 @@ usage(void)
printf(" --keep-system-libs keep -L%s entries in libs output\n", SYSTEM_LIBDIR); printf(" --keep-system-libs keep -L%s entries in libs output\n", SYSTEM_LIBDIR);
printf(" --path show the exact filenames for any matching .pc files\n"); printf(" --path show the exact filenames for any matching .pc files\n");
printf(" --modversion print the specified module's version to stdout\n"); printf(" --modversion print the specified module's version to stdout\n");
printf("\nfiltering output:\n\n");
printf(" --msvc-syntax print translatable fragments in MSVC syntax\n"); printf(" --msvc-syntax print translatable fragments in MSVC syntax\n");
printf(" --fragment-filter=types filter output fragments to the specified types\n");
printf("\nreport bugs to <%s>.\n", PACKAGE_BUGREPORT); printf("\nreport bugs to <%s>.\n", PACKAGE_BUGREPORT);
} }
@ -766,6 +776,7 @@ main(int argc, char *argv[])
{ "dont-relocate-paths", no_argument, &want_flags, PKG_DONT_RELOCATE_PATHS }, { "dont-relocate-paths", no_argument, &want_flags, PKG_DONT_RELOCATE_PATHS },
{ "env", required_argument, NULL, 48 }, { "env", required_argument, NULL, 48 },
{ "msvc-syntax", no_argument, &want_flags, PKG_MSVC_SYNTAX }, { "msvc-syntax", no_argument, &want_flags, PKG_MSVC_SYNTAX },
{ "fragment-filter", required_argument, NULL, 50 },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
@ -817,6 +828,9 @@ main(int argc, char *argv[])
case 48: case 48:
want_env_prefix = pkg_optarg; want_env_prefix = pkg_optarg;
break; break;
case 50:
want_fragment_filter = pkg_optarg;
break;
case '?': case '?':
case ':': case ':':
return EXIT_FAILURE; return EXIT_FAILURE;

2
man/pkgconf.1
View File

@ -159,6 +159,8 @@ files used by the dependency resolver for a given dependency set.
Print the requested values as variable declarations in a similar format as the Print the requested values as variable declarations in a similar format as the
.Xr env 1 .Xr env 1
command. command.
.It Fl -fragment-filter Ns = Ns Ar TYPES
Filter the fragment lists for the specified types.
.El .El
.Sh ENVIRONMENT .Sh ENVIRONMENT
.Bl -tag -width indent .Bl -tag -width indent