Attachment 116399 Details for Bug 90917 – Implement environment overrides of package variables

[patch] Implement environment overrides of package variables

pkg-config-0.28-env-vars.patch (text/plain), 1.10 KB, created by Alexander Larsson on 2015-06-09 18:54:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Larsson

Created: 2015-06-09 18:54:42 UTC

Size: 1.10 KB

patch

obsolete

>diff -up pkg-config-0.28/pkg.c.env pkg-config-0.28/pkg.c
>--- pkg-config-0.28/pkg.c.env	2015-06-09 19:02:56.189243446 +0200
>+++ pkg-config-0.28/pkg.c	2015-06-09 19:19:52.338657528 +0200
>@@ -1012,6 +1012,24 @@ define_global_variable (const char *varn
> }
> 
> char *
>+var_to_env_var (const char *key, const char *var)
>+{
>+  char *new = g_strconcat ("PKG_CONFIG_", key, "_", var, NULL);
>+  char *p;
>+  for (p = new; *p != 0; p++)
>+    {
>+      char c = g_ascii_toupper (*p);
>+
>+      if (!g_ascii_isalnum (c))
>+        c = '_';
>+
>+      *p = c;
>+    }
>+
>+  return new;
>+}
>+
>+char *
> package_get_var (Package *pkg,
>                  const char *var)
> {
>@@ -1019,7 +1037,17 @@ package_get_var (Package *pkg,
> 
>   if (globals)
>     varval = g_strdup (g_hash_table_lookup (globals, var));
>-  
>+
>+  if (pkg->key)
>+    {
>+      char *env_var = var_to_env_var (pkg->key, var);
>+      const char *env_var_content = g_getenv (env_var);
>+      g_free (env_var);
>+      if (env_var_content)
>+        return g_strdup (env_var_content);
>+    }
>+
>+
>   if (varval == NULL && pkg->vars)
>     varval = g_strdup (g_hash_table_lookup (pkg->vars, var));
>

Actions: View | Splinter Review

Attachments on bug 90917: 116399 | 116400 | 116401 | 116478 | 116498 | 116499 | 116501 | 116502 | 116503 | 116504 | 116505 | 116506

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.