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

cli: remove package count restriction from --modversion
ci/woodpecker/push/woodpecker Pipeline was successful Details 

Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
pull/190/head
Ariadne Conill 2023-08-11 13:48:02 -07:00
parent fe69ccc6b9
commit 95086643fa
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/main.c
View File

@ -1119,7 +1119,6 @@ main(int argc, char *argv[])
(want_flags & PKG_REQUIRES_PRIVATE) == PKG_REQUIRES_PRIVATE || (want_flags & PKG_REQUIRES_PRIVATE) == PKG_REQUIRES_PRIVATE ||
(want_flags & PKG_PROVIDES) == PKG_PROVIDES || (want_flags & PKG_PROVIDES) == PKG_PROVIDES ||
(want_flags & PKG_VARIABLES) == PKG_VARIABLES || (want_flags & PKG_VARIABLES) == PKG_VARIABLES ||
(want_flags & PKG_MODVERSION) == PKG_MODVERSION ||
(want_flags & PKG_PATH) == PKG_PATH || (want_flags & PKG_PATH) == PKG_PATH ||
want_variable != NULL)) want_variable != NULL))
{ {
@ -1127,6 +1126,10 @@ main(int argc, char *argv[])
maximum_traverse_depth = 1; maximum_traverse_depth = 1;
} }
/* we also want to walk only the flattened dependencies if we are requesting --modversion. */
if ((want_flags & PKG_MODVERSION) == PKG_MODVERSION)
maximum_traverse_depth = 1;
if (getenv("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS") != NULL) if (getenv("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS") != NULL)
want_flags |= PKG_KEEP_SYSTEM_CFLAGS; want_flags |= PKG_KEEP_SYSTEM_CFLAGS;