From 0936824bf02c604457147af1858ae6f5b504155f Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Wed, 16 Aug 2006 20:42:38 +0200 Subject: [PATCH] 2006-08-16 Tollef Fog Heen * pkg.c (packages_get_other_cflags, package_get_other_cflags) (packages_get_I_cflags): Always add all cflags. Debian #340904 --- ChangeLog | 3 +++ pkg.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92fee0f..4d3c92f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-08-16 Tollef Fog Heen + * pkg.c (packages_get_other_cflags, package_get_other_cflags) + (packages_get_I_cflags): Always add all cflags. Debian #340904 + * main.c (main): Always add the elements from PKG_CONFIG_PATH. Freedesktop #4795. diff --git a/pkg.c b/pkg.c index e200a52..6904bca 100644 --- a/pkg.c +++ b/pkg.c @@ -1139,14 +1139,14 @@ char * packages_get_I_cflags (GSList *pkgs) { /* sort by path position so PKG_CONFIG_PATH affects -I flag order */ - return get_multi_merged (pkgs, get_I_cflags, TRUE, FALSE); + return get_multi_merged (pkgs, get_I_cflags, TRUE, TRUE); } char * package_get_other_cflags (Package *pkg) { if (pkg->other_cflags_merged == NULL) - pkg->other_cflags_merged = get_merged (pkg, get_other_cflags, TRUE, FALSE); + pkg->other_cflags_merged = get_merged (pkg, get_other_cflags, TRUE, TRUE); return pkg->other_cflags_merged; } @@ -1154,7 +1154,7 @@ package_get_other_cflags (Package *pkg) char * packages_get_other_cflags (GSList *pkgs) { - return get_multi_merged (pkgs, get_other_cflags, TRUE, FALSE); + return get_multi_merged (pkgs, get_other_cflags, TRUE, TRUE); } char * -- 2.39.5