diff options
| -rwxr-xr-x | check/check-duplicate-flags | 7 | ||||
| -rwxr-xr-x | check/check-gtk | 14 | ||||
| -rw-r--r-- | pkg.c | 43 |
3 files changed, 25 insertions, 39 deletions
diff --git a/check/check-duplicate-flags b/check/check-duplicate-flags index 4e0bcab..110da5b 100755 --- a/check/check-duplicate-flags +++ b/check/check-duplicate-flags @@ -4,11 +4,12 @@ set -e . ${srcdir}/common -RESULT="-DPATH2 -DPATH1 -DFOO -I/path/include" +RESULT="-DPATH2 -DFOO -DPATH1 -DFOO -I/path/include" run_test --cflags flag-dup-1 flag-dup-2 run_test --cflags flag-dup-2 flag-dup-1 -RESULT="-L/path/lib -lpath2 -lpath1 -Wl,--whole-archive -lm \ ---Wl,--no-whole-archive -R -Xlinker /path/lib" +RESULT="-L/path/lib -lpath2 -Wl,--whole-archive -lm --Wl,--no-whole-archive \ +-Xlinker -R -Xlinker /path/lib -lpath1 -Wl,--whole-archive -lm \ +--Wl,--no-whole-archive -Xlinker -R -Xlinker /path/lib" run_test --libs flag-dup-1 flag-dup-2 run_test --libs flag-dup-2 flag-dup-1 diff --git a/check/check-gtk b/check/check-gtk index e42892b..7fd01bb 100755 --- a/check/check-gtk +++ b/check/check-gtk @@ -16,7 +16,8 @@ PKG_CONFIG_LIBDIR=${srcdir}/gtk RESULT="-DGSEAL_ENABLE -pthread -I/gtk/include/gtk-3.0 \ -I/gtk/include/pango-1.0 -I/gtk/include/atk-1.0 -I/gtk/include/cairo \ -I/gtk/include/pixman-1 -I/gtk/include -I/gtk/include/gdk-pixbuf-2.0 \ --I/gtk/include/glib-2.0 -I/gtk/lib/glib-2.0/include -I/gtk/include/freetype2" +-I/gtk/include -I/gtk/include/pango-1.0 -I/gtk/include/glib-2.0 \ +-I/gtk/lib/glib-2.0/include -I/gtk/include/freetype2 -I/gtk/include" run_test --cflags gtk+-3.0 run_test --cflags --static gtk+-3.0 @@ -28,7 +29,8 @@ run_test --cflags --static gtk+-3.0 # -lglib-2.0 RESULT="-L/gtk/lib -lgtk-3 -lgdk-3 -lpangocairo-1.0 -latk-1.0 -lcairo-gobject \ -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 \ --lgthread-2.0 -lgmodule-2.0 -pthread -lrt -lglib-2.0 -lfreetype -lfontconfig" +-lgthread-2.0 -pthread -lrt -lgmodule-2.0 -pthread -lrt -lglib-2.0 -lfreetype \ +-lfontconfig" if [ "$list_indirect_deps" = no ]; then run_test --libs gtk+-3.0 fi @@ -47,10 +49,10 @@ fi # -lpango-1.0 -lfontconfig -lexpat -lfreetype -lgobject-2.0 -lffi \ # -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0 -lrt RESULT="-L/gtk/lib -lgtk-3 -lgdk-3 -lpangocairo-1.0 -latk-1.0 -lcairo-gobject \ --lcairo -lpixman-1 -lXrender -lX11 -lpthread -lxcb -lXau -lgdk_pixbuf-2.0 \ --lpng12 -lm -lgio-2.0 -lz -lresolv -lpangoft2-1.0 -lpango-1.0 -lgobject-2.0 \ --lffi -lgthread-2.0 -lgmodule-2.0 -pthread -ldl -lglib-2.0 -lrt -lfontconfig \ --lexpat -lfreetype" +-lcairo -lz -lpixman-1 -lpng12 -lz -lm -lXrender -lX11 -lpthread -lxcb -lXau \ +-lgdk_pixbuf-2.0 -lm -lpng12 -lz -lm -lgio-2.0 -lz -lresolv -lpangoft2-1.0 \ +-lpango-1.0 -lgobject-2.0 -lffi -lgthread-2.0 -pthread -lrt -lgmodule-2.0 \ +-pthread -lrt -ldl -lglib-2.0 -lrt -lfreetype -lfontconfig -lexpat -lfreetype" if [ "$list_indirect_deps" = yes ]; then run_test --libs gtk+-3.0 fi @@ -424,47 +424,30 @@ get_package_quiet (const char *name) return internal_get_package (name, FALSE); } +/* Strip consecutive duplicate arguments in the flag list. */ static GList * -flag_list_strip_duplicates (GList *list, gboolean forward) +flag_list_strip_duplicates (GList *list) { - GHashTable *table; GList *tmp; - table = g_hash_table_new (g_str_hash, g_str_equal); - for (tmp = forward ? list : g_list_last (list); - tmp != NULL; - tmp = forward ? g_list_next (tmp) : g_list_previous (tmp)) + /* Start at the 2nd element of the list so we don't have to check for an + * existing previous element. */ + for (tmp = g_list_next (list); tmp != NULL; tmp = g_list_next (tmp)) { - Flag *flag = tmp->data; + Flag *cur = tmp->data; + Flag *prev = tmp->prev->data; - debug_spew ("Seeing if arg %s is duplicate\n", flag->arg); - - if (!g_hash_table_lookup_extended (table, flag->arg, NULL, NULL)) - { - /* Unique flag. Track it and and move to the next. */ - g_hash_table_replace (table, flag->arg, flag->arg); - } - else + if (cur->type == prev->type && g_strcmp0 (cur->arg, prev->arg) == 0) { - GList *dup = tmp; - /* Remove the duplicate flag from the list and move to the last * element to prepare for the next iteration. */ - if (forward) - { - debug_spew (" removing duplicate \"%s\"\n", flag->arg); - tmp = g_list_previous (tmp); - } - else - { - debug_spew (" removing duplicate (from back) \"%s\"\n", - flag->arg); - tmp = g_list_next (tmp); - } + GList *dup = tmp; + + debug_spew (" removing duplicate \"%s\"\n", cur->arg); + tmp = g_list_previous (tmp); list = g_list_remove_link (list, dup); } } - g_hash_table_destroy (table); return list; } @@ -960,7 +943,7 @@ get_multi_merged (GList *pkgs, FlagType type, gboolean in_path_order, char *retval; list = fill_list (pkgs, type, in_path_order, include_private); - list = flag_list_strip_duplicates (list, in_path_order); + list = flag_list_strip_duplicates (list); retval = flag_list_to_string (list); g_list_free (list); |