From 8fbecafdaece2c07f685a94d7c1f3d42b929e32a Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 15 Mar 2013 17:29:07 -0500
Subject: [PATCH] fragment: special-case `-framework` handling and implement
 merge-back strategy for -F flags (closes #47)

---
 fragment.c | 34 ++++++++++++++++++++++++++++++----
 pkg.h      |  1 -
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/fragment.c b/fragment.c
index 6db4685..845e448 100644
--- a/fragment.c
+++ b/fragment.c
@@ -23,7 +23,7 @@ pkg_fragment_add(pkg_list_t *list, const char *string)
 
 	frag = calloc(sizeof(pkg_fragment_t), 1);
 
-	if (*string == '-' && strncmp(string, "-lib:", 5))
+	if (*string == '-' && strncmp(string, "-lib:", 5) && strncmp(string, "-framework", 10))
 	{
 		frag->type = *(string + 1);
 		frag->data = strdup(string + 2);
@@ -56,10 +56,34 @@ pkg_fragment_lookup(pkg_list_t *list, pkg_fragment_t *base)
 	return NULL;
 }
 
-bool
+static inline bool
+pkg_fragment_can_merge_back(pkg_fragment_t *base)
+{
+	if (base->type == 'F')
+		return false;
+
+	return true;
+}
+
+static inline bool
+pkg_fragment_can_merge(pkg_fragment_t *base)
+{
+	if (!strncmp(base->data, "-framework", 10))
+		return false;
+
+	return true;
+}
+
+static inline pkg_fragment_t *
 pkg_fragment_exists(pkg_list_t *list, pkg_fragment_t *base)
 {
-	return pkg_fragment_lookup(list, base) != NULL;
+	if (!pkg_fragment_can_merge_back(base))
+		return NULL;
+
+	if (!pkg_fragment_can_merge(base))
+		return NULL;
+
+	return pkg_fragment_lookup(list, base);
 }
 
 void
@@ -67,8 +91,10 @@ pkg_fragment_copy(pkg_list_t *list, pkg_fragment_t *base)
 {
 	pkg_fragment_t *frag;
 
-	if ((frag = pkg_fragment_lookup(list, base)) != NULL)
+	if ((frag = pkg_fragment_exists(list, base)) != NULL)
 		pkg_fragment_delete(list, frag);
+	else if (!pkg_fragment_can_merge_back(base) && (pkg_fragment_lookup(list, base) != NULL))
+		return;
 
 	frag = calloc(sizeof(pkg_fragment_t), 1);
 
diff --git a/pkg.h b/pkg.h
index 26ab7df..610e645 100644
--- a/pkg.h
+++ b/pkg.h
@@ -160,7 +160,6 @@ void pkg_fragment_parse(pkg_list_t *list, pkg_list_t *vars, const char *value);
 void pkg_fragment_add(pkg_list_t *list, const char *string);
 void pkg_fragment_copy(pkg_list_t *list, pkg_fragment_t *base);
 void pkg_fragment_delete(pkg_list_t *list, pkg_fragment_t *node);
-bool pkg_fragment_exists(pkg_list_t *head, pkg_fragment_t *base);
 void pkg_fragment_free(pkg_list_t *list);
 
 /* fileio.c */