diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2012-11-15 06:32:36 -0800 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-12-03 07:05:43 -0800 |
| commit | 428362266e77d976e3579d2efaa53ec28bd51d97 (patch) | |
| tree | 8a74f8e3b46ef365a23c3fbe795cdd94d11bf0c4 /check | |
| parent | e8086bc54fa0f9e2e5f10408cfccbcba8ba9b434 (diff) | |
| download | pkg-config-428362266e77d976e3579d2efaa53ec28bd51d97.tar.gz | |
Remove duplicate packages after resolving requires
Makes the resolved package list be correctly serialized with each
package only appearing once. This provides more consistency between the
various flag outputs by ensuring that the flags from each package are
only grabbed once. This makes a difference since the duplicate flag
stripping happens from the end of the output (-l) or the beginning of
the output (-L/-I/other).
Diffstat (limited to 'check')
| -rwxr-xr-x | check/check-duplicate-flags | 1 | ||||
| -rwxr-xr-x | check/check-gtk | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/check/check-duplicate-flags b/check/check-duplicate-flags index b1ab54b..c80f650 100755 --- a/check/check-duplicate-flags +++ b/check/check-duplicate-flags @@ -6,7 +6,6 @@ set -e RESULT="-DPATH2 -DFOO -DPATH1 -I/path/include" run_test --cflags flag-dup-1 flag-dup-2 -RESULT="-DPATH1 -DFOO -DPATH2 -I/path/include" run_test --cflags flag-dup-2 flag-dup-1 RESULT="-Wl,--whole-archive --Wl,--no-whole-archive -Xlinker -R /path/lib \ diff --git a/check/check-gtk b/check/check-gtk index 9795a5e..3f9aae7 100755 --- a/check/check-gtk +++ b/check/check-gtk @@ -14,10 +14,9 @@ PKG_CONFIG_LIBDIR=${srcdir}/gtk # -I/gtk/include/glib-2.0 -I/gtk/lib/glib-2.0/include -I/gtk/include/pixman-1 \ # -I/gtk/include -I/gtk/include/freetype2 RESULT="-DGSEAL_ENABLE -pthread -I/gtk/include/gtk-3.0 \ --I/gtk/include/pango-1.0 -I/gtk/include -I/gtk/include/freetype2 \ --I/gtk/include/glib-2.0 -I/gtk/lib/glib-2.0/include \ --I/gtk/include/gdk-pixbuf-2.0 -I/gtk/include/cairo -I/gtk/include/pixman-1 \ --I/gtk/include/atk-1.0" +-I/gtk/include/pango-1.0 -I/gtk/include/atk-1.0 -I/gtk/include/cairo \ +-I/gtk/include/gdk-pixbuf-2.0 -I/gtk/include -I/gtk/include/freetype2 \ +-I/gtk/include/pixman-1 -I/gtk/include/glib-2.0 -I/gtk/lib/glib-2.0/include" run_test --cflags gtk+-3.0 run_test --cflags --static gtk+-3.0 |