aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Bradford <rob@o-hand.com>2008-04-03 13:31:12 +0000
committerrob <rob@aea7fca7-3721-49c4-ace3-ac8c44b998bb>2008-04-03 13:31:12 +0000
commit102fcd2aeda63c1841a12e1ceed4beacf0eff478 (patch)
treeefe9bc6669914b7f3c69acfe45c64bea64055e44
parentb99a269934068d128e93c91f20c07ec003a96705 (diff)
downloadanjuta-poky-102fcd2aeda63c1841a12e1ceed4beacf0eff478.tar.gz
anjuta-poky-102fcd2aeda63c1841a12e1ceed4beacf0eff478.tar.bz2
anjuta-poky-102fcd2aeda63c1841a12e1ceed4beacf0eff478.zip
2008-04-03 Rob Bradford <rob@openedhand.com>
* src/plugin.c: (update_environment): Add support for using the new pkgconfig path in toolchain mode.
-rw-r--r--ChangeLog5
-rw-r--r--src/plugin.c23
2 files changed, 20 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 14d7d9e..1ed5cfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-03 Rob Bradford <rob@openedhand.com>
+
+ * src/plugin.c: (update_environment):
+ Add support for using the new pkgconfig path in toolchain mode.
+
2008-03-25 Rob Bradford <rob@openedhand.com>
* src/plugin.c: (update_state):
diff --git a/src/plugin.c b/src/plugin.c
index 92314dc..59e370b 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -1162,6 +1162,9 @@ static void
update_environment (AnjutaPluginSdk *sp)
{
gchar *tmp = NULL;
+ gchar *pkg_config_usr_path = NULL;
+ gchar *pkg_config_path = NULL;
+
if (sp->triplet == NULL ||
(sp->poky_mode == POKY_MODE_TOOLCHAIN && sp->sdk_root == NULL) ||
@@ -1179,26 +1182,30 @@ update_environment (AnjutaPluginSdk *sp)
setenv ("PKG_CONFIG_SYSROOT_DIR", tmp, 1);
g_free (tmp);
- tmp = g_build_filename (sp->sdk_root, sp->triplet, "lib", "pkgconfig", NULL);
+ pkg_config_path = g_build_filename (sp->sdk_root, sp->triplet, "lib",
+ "pkgconfig", NULL);
+ pkg_config_usr_path = g_build_filename (sp->sdk_root, sp->triplet, "usr",
+ "lib", "pkgconfig", NULL);
+ tmp = g_strdup_printf ("%s:%s", pkg_config_usr_path, pkg_config_path);
+
setenv ("PKG_CONFIG_PATH", tmp, 1);
+ g_free (pkg_config_path);
+ g_free (pkg_config_usr_path);
g_free (tmp);
tmp = g_build_filename (sp->sdk_root, "site-config", NULL);
setenv ("CONFIG_SITE", tmp, 1);
g_free (tmp);
} else {
- gchar *pkg_config_usr_path = NULL;
- gchar *pkg_config_path = NULL;
-
tmp = g_build_filename (sp->poky_root, "build", "tmp", "staging",
sp->triplet, NULL);
setenv ("PKG_CONFIG_SYSROOT_DIR", tmp, 1);
g_free (tmp);
- pkg_config_usr_path = g_build_filename (sp->poky_root, "build", "tmp", "staging", sp->triplet,
- "usr", "lib", "pkgconfig", NULL);
- pkg_config_path = g_build_filename (sp->poky_root, "build", "tmp", "staging", sp->triplet,
- "lib", "pkgconfig", NULL);
+ pkg_config_usr_path = g_build_filename (sp->poky_root, "build", "tmp",
+ "staging", sp->triplet, "usr", "lib", "pkgconfig", NULL);
+ pkg_config_path = g_build_filename (sp->poky_root, "build", "tmp",
+ "staging", sp->triplet, "lib", "pkgconfig", NULL);
tmp = g_strdup_printf ("%s:%s", pkg_config_usr_path, pkg_config_path);
setenv ("PKG_CONFIG_PATH", tmp, 1);
g_free (pkg_config_path);