"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "parse.c" between
pkg-config-0.29.1.tar.gz and pkg-config-0.29.2.tar.gz

About: pkg-config returns (meta-)information about installed libraries (to make putting together all the build flags when compiling/linking a lot easier).

parse.c  (pkg-config-0.29.1):parse.c  (pkg-config-0.29.2)
skipping to change at line 862 skipping to change at line 862
pkg->cflags = g_list_prepend (pkg->cflags, flag); pkg->cflags = g_list_prepend (pkg->cflags, flag);
} }
else if ((strcmp ("-idirafter", arg) == 0 || else if ((strcmp ("-idirafter", arg) == 0 ||
strcmp ("-isystem", arg) == 0) && strcmp ("-isystem", arg) == 0) &&
i+1 < argc) i+1 < argc)
{ {
char *option, *tmp; char *option, *tmp;
tmp = trim_string (argv[i+1]); tmp = trim_string (argv[i+1]);
option = strdup_escape_shell (tmp); option = strdup_escape_shell (tmp);
flag->type = CFLAGS_OTHER;
/* These are -I flags since they control the search path */
flag->type = CFLAGS_I;
flag->arg = g_strconcat (arg, " ", option, NULL); flag->arg = g_strconcat (arg, " ", option, NULL);
pkg->cflags = g_list_prepend (pkg->cflags, flag); pkg->cflags = g_list_prepend (pkg->cflags, flag);
i++; i++;
g_free (option); g_free (option);
g_free (tmp); g_free (tmp);
} }
else if (*arg != '\0') else if (*arg != '\0')
{ {
flag->type = CFLAGS_OTHER; flag->type = CFLAGS_OTHER;
flag->arg = g_strdup (arg); flag->arg = g_strdup (arg);
skipping to change at line 1047 skipping to change at line 1049
varname = g_strdup (tag); varname = g_strdup (tag);
debug_spew (" Variable declaration, '%s' overridden with '%s'\n", debug_spew (" Variable declaration, '%s' overridden with '%s'\n",
tag, prefix); tag, prefix);
g_hash_table_insert (pkg->vars, varname, prefix); g_hash_table_insert (pkg->vars, varname, prefix);
goto cleanup; goto cleanup;
} }
} }
else if (define_prefix && else if (define_prefix &&
pkg->orig_prefix != NULL && pkg->orig_prefix != NULL &&
*(pkg->orig_prefix) != '\0' &&
strncmp (p, pkg->orig_prefix, strlen (pkg->orig_prefix)) == 0 && strncmp (p, pkg->orig_prefix, strlen (pkg->orig_prefix)) == 0 &&
G_IS_DIR_SEPARATOR (p[strlen (pkg->orig_prefix)])) G_IS_DIR_SEPARATOR (p[strlen (pkg->orig_prefix)]))
{ {
char *oldstr = str; char *oldstr = str;
p = str = g_strconcat (g_hash_table_lookup (pkg->vars, prefix_variable) , p = str = g_strconcat (g_hash_table_lookup (pkg->vars, prefix_variable) ,
p + strlen (pkg->orig_prefix), NULL); p + strlen (pkg->orig_prefix), NULL);
g_free (oldstr); g_free (oldstr);
} }
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS