From 40402298efd5884948e50b5f3830ab3f0dbbaf08 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 11 May 2012 20:07:45 -0500 Subject: [PATCH] main: use PKGF_MERGE_PRIVATE_FRAGMENTS --- main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main.c b/main.c index 4e3c733..0c7f0a8 100644 --- a/main.c +++ b/main.c @@ -142,12 +142,11 @@ collect_libs(pkg_t *pkg, void *data, unsigned int flags) { pkg_fragment_t **list = data; pkg_fragment_t *frag; - (void) flags; PKG_FOREACH_LIST_ENTRY(pkg->libs, frag) *list = pkg_fragment_copy(*list, frag); - if (want_static) + if (flags & PKGF_MERGE_PRIVATE_FRAGMENTS) { PKG_FOREACH_LIST_ENTRY(pkg->libs_private, frag) *list = pkg_fragment_copy(*list, frag); @@ -580,7 +579,7 @@ main(int argc, char *argv[]) } if (want_static) - global_traverse_flags |= PKGF_SEARCH_PRIVATE; + global_traverse_flags |= (PKGF_SEARCH_PRIVATE | PKGF_MERGE_PRIVATE_FRAGMENTS); if (want_env_only) global_traverse_flags |= PKGF_ENV_ONLY;