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

lite: remove --simulate

pull/191/head
William Pitcock 2019-05-06 15:22:11 -05:00
parent 2d0c1f5cb7
commit 0ba98da26c
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.lite
View File

@ -32,6 +32,7 @@ SRCS = \
OBJS = ${SRCS:.c=.o} OBJS = ${SRCS:.c=.o}
CFLAGS = ${STATIC} -DPKGCONF_LITE -I. -Ilibpkgconf -Icli -DSYSTEM_LIBDIR=\"${SYSTEM_LIBDIR}\" -DSYSTEM_INCLUDEDIR=\"${SYSTEM_INCLUDEDIR}\" -DPKG_DEFAULT_PATH=\"${PKG_DEFAULT_PATH}\" CFLAGS = ${STATIC} -DPKGCONF_LITE -I. -Ilibpkgconf -Icli -DSYSTEM_LIBDIR=\"${SYSTEM_LIBDIR}\" -DSYSTEM_INCLUDEDIR=\"${SYSTEM_INCLUDEDIR}\" -DPKG_DEFAULT_PATH=\"${PKG_DEFAULT_PATH}\"
STATIC = STATIC =
STRIP = strip
all: pkgconf-lite all: pkgconf-lite
@ -46,6 +47,7 @@ libpkgconf/config.h:
pkgconf-lite: preflight libpkgconf/config.h ${OBJS} pkgconf-lite: preflight libpkgconf/config.h ${OBJS}
${CC} ${STATIC} -o $@ ${OBJS} ${CC} ${STATIC} -o $@ ${OBJS}
${STRIP} $@
clean: clean:
rm -f libpkgconf/config.h rm -f libpkgconf/config.h

8
cli/main.c
View File

@ -546,6 +546,7 @@ apply_uninstalled(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, in
return true; return true;
} }
#ifndef PKGCONF_LITE
static void static void
print_graph_node(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *data) print_graph_node(pkgconf_client_t *client, pkgconf_pkg_t *pkg, void *data)
{ {
@ -589,6 +590,7 @@ apply_simulate(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int m
return true; return true;
} }
#endif
static void static void
version(void) version(void)
@ -629,7 +631,9 @@ usage(void)
printf(" --silence-errors explicitly be silent about errors\n"); printf(" --silence-errors explicitly be silent about errors\n");
printf(" --list-all list all known packages\n"); printf(" --list-all list all known packages\n");
printf(" --list-package-names list all known package names\n"); printf(" --list-package-names list all known package names\n");
#ifndef PKGCONF_LITE
printf(" --simulate simulate walking the calculated dependency graph\n"); printf(" --simulate simulate walking the calculated dependency graph\n");
#endif
printf(" --no-cache do not cache already seen packages when\n"); printf(" --no-cache do not cache already seen packages when\n");
printf(" walking the dependency graph\n"); printf(" walking the dependency graph\n");
printf(" --log-file=filename write an audit log to a specified file\n"); printf(" --log-file=filename write an audit log to a specified file\n");
@ -849,7 +853,9 @@ main(int argc, char *argv[])
{ "silence-errors", no_argument, &want_flags, PKG_SILENCE_ERRORS, }, { "silence-errors", no_argument, &want_flags, PKG_SILENCE_ERRORS, },
{ "list-all", no_argument, &want_flags, PKG_LIST|PKG_PRINT_ERRORS, }, { "list-all", no_argument, &want_flags, PKG_LIST|PKG_PRINT_ERRORS, },
{ "list-package-names", no_argument, &want_flags, PKG_LIST_PACKAGE_NAMES|PKG_PRINT_ERRORS, }, { "list-package-names", no_argument, &want_flags, PKG_LIST_PACKAGE_NAMES|PKG_PRINT_ERRORS, },
#ifndef PKGCONF_LITE
{ "simulate", no_argument, &want_flags, PKG_SIMULATE, }, { "simulate", no_argument, &want_flags, PKG_SIMULATE, },
#endif
{ "no-cache", no_argument, &want_flags, PKG_NO_CACHE, }, { "no-cache", no_argument, &want_flags, PKG_NO_CACHE, },
{ "print-provides", no_argument, &want_flags, PKG_PROVIDES, }, { "print-provides", no_argument, &want_flags, PKG_PROVIDES, },
{ "no-provides", no_argument, &want_flags, PKG_NO_PROVIDES, }, { "no-provides", no_argument, &want_flags, PKG_NO_PROVIDES, },
@ -1273,6 +1279,7 @@ main(int argc, char *argv[])
ret = EXIT_SUCCESS; ret = EXIT_SUCCESS;
#ifndef PKGCONF_LITE
if ((want_flags & PKG_SIMULATE) == PKG_SIMULATE) if ((want_flags & PKG_SIMULATE) == PKG_SIMULATE)
{ {
want_flags &= ~(PKG_CFLAGS|PKG_LIBS); want_flags &= ~(PKG_CFLAGS|PKG_LIBS);
@ -1284,6 +1291,7 @@ main(int argc, char *argv[])
goto out; goto out;
} }
} }
#endif
if (!pkgconf_queue_validate(&pkg_client, &pkgq, maximum_traverse_depth)) if (!pkgconf_queue_validate(&pkg_client, &pkgq, maximum_traverse_depth))
{ {