Compare commits
2 Commits
a1a415111f
...
ab352222a2
Author | SHA1 | Date |
---|---|---|
Ariadne Conill | ab352222a2 | |
Ariadne Conill | 04a6dda79f |
17
cli/main.c
17
cli/main.c
|
@ -346,16 +346,6 @@ apply_path(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int max
|
|||
return true;
|
||||
}
|
||||
|
||||
static void
|
||||
print_variable(pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *variable)
|
||||
{
|
||||
const char *var;
|
||||
|
||||
var = pkgconf_tuple_find(client, &pkg->vars, variable);
|
||||
if (var != NULL)
|
||||
printf("%s", var);
|
||||
}
|
||||
|
||||
static bool
|
||||
apply_variable(pkgconf_client_t *client, pkgconf_pkg_t *world, void *variable, int maxdepth)
|
||||
{
|
||||
|
@ -366,11 +356,12 @@ apply_variable(pkgconf_client_t *client, pkgconf_pkg_t *world, void *variable, i
|
|||
{
|
||||
pkgconf_dependency_t *dep = iter->data;
|
||||
pkgconf_pkg_t *pkg = dep->match;
|
||||
const char *var;
|
||||
|
||||
if (iter->prev != NULL)
|
||||
printf(" ");
|
||||
var = pkgconf_tuple_find(client, &pkg->vars, variable);
|
||||
|
||||
print_variable(client, pkg, variable);
|
||||
if (var != NULL)
|
||||
printf("%s%s", iter->prev != NULL ? " " : "", var);
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
|
|
|
@ -72,7 +72,7 @@ libs_cflags_version_multiple_body()
|
|||
{
|
||||
export PKG_CONFIG_PATH="${selfdir}/lib1"
|
||||
atf_check \
|
||||
-o inline:"-I/test/include/foo -fPIC -L/test/lib -lbar -lfoo \n" \
|
||||
-o inline:"-fPIC -I/test/include/foo -L/test/lib -lbar -lfoo \n" \
|
||||
pkgconf --cflags --libs 'foo > 1.2 bar >= 1.3'
|
||||
}
|
||||
|
||||
|
@ -80,7 +80,7 @@ libs_cflags_version_multiple_coma_body()
|
|||
{
|
||||
export PKG_CONFIG_PATH="${selfdir}/lib1"
|
||||
atf_check \
|
||||
-o inline:"-I/test/include/foo -fPIC -L/test/lib -lbar -lfoo \n" \
|
||||
-o inline:"-fPIC -I/test/include/foo -L/test/lib -lbar -lfoo \n" \
|
||||
pkgconf --cflags --libs 'foo > 1.2,bar >= 1.3'
|
||||
}
|
||||
|
||||
|
|
|
@ -223,7 +223,7 @@ virtual_variable_body()
|
|||
|
||||
fragment_collision_body()
|
||||
{
|
||||
atf_check -o inline:"-D_BAZ -D_BAR -D_FOO -D_THREAD_SAFE -pthread \n" \
|
||||
atf_check -o inline:"-D_BAZ -D_FOO -D_BAR -D_THREAD_SAFE -pthread \n" \
|
||||
pkgconf --with-path="${selfdir}/lib1" --cflags fragment-collision
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue