summaryrefslogtreecommitdiff
path: root/libpkgconf/libpkgconf/fragment.c
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2021-10-20 17:06:32 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2021-10-20 17:06:32 +0300
commite00a421e51b5747696f89b6611eba1d0010dd501 (patch)
tree89ebd5975b58597c4e8555144f98ad26333c40a8 /libpkgconf/libpkgconf/fragment.c
parentf76df6b5b3ad65675058bf6ab0aa8bf6e14e11ac (diff)
Release version 1.6.3+5v1.6.3+5
Prevent dropping of -framework options in Libs value Change manifest builds value from all to host Disable the success build emails Cleanup comments in tests/basic/driver.c
Diffstat (limited to 'libpkgconf/libpkgconf/fragment.c')
-rw-r--r--libpkgconf/libpkgconf/fragment.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/libpkgconf/libpkgconf/fragment.c b/libpkgconf/libpkgconf/fragment.c
index 37830c8..42d5f95 100644
--- a/libpkgconf/libpkgconf/fragment.c
+++ b/libpkgconf/libpkgconf/fragment.c
@@ -341,13 +341,16 @@ pkgconf_fragment_copy(const pkgconf_client_t *client, pkgconf_list_t *list, cons
{
pkgconf_fragment_t *frag;
- if ((frag = pkgconf_fragment_exists(list, base, client->flags, is_private)) != NULL)
- {
- if (pkgconf_fragment_should_merge(frag))
- pkgconf_fragment_delete(list, frag);
- }
- else if (!is_private && !pkgconf_fragment_can_merge_back(base, client->flags, is_private) && (pkgconf_fragment_lookup(list, base) != NULL))
- return;
+ if (!(client->flags & PKGCONF_PKG_PKGF_DONT_MERGE_SPECIAL_FRAGMENTS))
+ {
+ if ((frag = pkgconf_fragment_exists(list, base, client->flags, is_private)) != NULL)
+ {
+ if (pkgconf_fragment_should_merge(frag))
+ pkgconf_fragment_delete(list, frag);
+ }
+ else if (!is_private && !pkgconf_fragment_can_merge_back(base, client->flags, is_private) && (pkgconf_fragment_lookup(list, base) != NULL))
+ return;
+ }
frag = calloc(sizeof(pkgconf_fragment_t), 1);