ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

Improve prefix rewriting on Windows #177

Merged
TingPing merged 2 commits from relative-prefix into master 2018-03-08 05:00:23 +00:00
Conversation 0 Commits 2 Files Changed 2
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/main.c
View File

@ -922,7 +922,11 @@ main(int argc, char *argv[])
if ((want_flags & PKG_NO_CACHE) == PKG_NO_CACHE) if ((want_flags & PKG_NO_CACHE) == PKG_NO_CACHE)
want_client_flags |= PKGCONF_PKG_PKGF_NO_CACHE; want_client_flags |= PKGCONF_PKG_PKGF_NO_CACHE;
/* On Windows we want to always redefine the prefix by default
* but allow that behavior to be manually disabled */
#if !defined(_WIN32) && !defined(_WIN64)
if ((want_flags & PKG_DEFINE_PREFIX) == PKG_DEFINE_PREFIX) if ((want_flags & PKG_DEFINE_PREFIX) == PKG_DEFINE_PREFIX)
#endif
want_client_flags |= PKGCONF_PKG_PKGF_REDEFINE_PREFIX; want_client_flags |= PKGCONF_PKG_PKGF_REDEFINE_PREFIX;
if ((want_flags & PKG_NO_UNINSTALLED) == PKG_NO_UNINSTALLED || getenv("PKG_CONFIG_DISABLE_UNINSTALLED") != NULL) if ((want_flags & PKG_NO_UNINSTALLED) == PKG_NO_UNINSTALLED || getenv("PKG_CONFIG_DISABLE_UNINSTALLED") != NULL)

23
libpkgconf/pkg.c
View File

@ -287,6 +287,8 @@ pkgconf_pkg_new_from_file(pkgconf_client_t *client, const char *filename, FILE *
pkgconf_pkg_t *pkg; pkgconf_pkg_t *pkg;
char readbuf[PKGCONF_BUFSIZE]; char readbuf[PKGCONF_BUFSIZE];
char pathbuf[PKGCONF_ITEM_SIZE]; char pathbuf[PKGCONF_ITEM_SIZE];
char original_prefix[PKGCONF_ITEM_SIZE];
char prefix[PKGCONF_ITEM_SIZE];
char *idptr; char *idptr;
size_t lineno = 0; size_t lineno = 0;
@ -294,6 +296,8 @@ pkgconf_pkg_new_from_file(pkgconf_client_t *client, const char *filename, FILE *
pkg->filename = strdup(filename); pkg->filename = strdup(filename);
pkgconf_tuple_add(client, &pkg->vars, "pcfiledir", pkg_get_parent_dir(pkg, pathbuf, sizeof pathbuf), true); pkgconf_tuple_add(client, &pkg->vars, "pcfiledir", pkg_get_parent_dir(pkg, pathbuf, sizeof pathbuf), true);
original_prefix[0] = '\0';
/* make module id */ /* make module id */
if ((idptr = strrchr(pkg->filename, PKG_DIR_SEP_S)) != NULL) if ((idptr = strrchr(pkg->filename, PKG_DIR_SEP_S)) != NULL)
idptr++; idptr++;
@ -368,7 +372,22 @@ pkgconf_pkg_new_from_file(pkgconf_client_t *client, const char *filename, FILE *
pkgconf_pkg_parser_keyword_set(client, pkg, lineno, key, value); pkgconf_pkg_parser_keyword_set(client, pkg, lineno, key, value);
break; break;
case '=': case '=':
if (strcmp(key, client->prefix_varname) || !(client->flags & PKGCONF_PKG_PKGF_REDEFINE_PREFIX)) /* Some pc files will use absolute paths for all of their directories
* which is broken when redefining the prefix. We try to outsmart the
* file and rewrite any directory that starts with the same prefix.
* Note that `pkg-config` just blindly sets all of the directories
* so this is a behavioral difference but arguablly more correct.
*/
if (client->flags & PKGCONF_PKG_PKGF_REDEFINE_PREFIX && original_prefix[0]
&& !strncmp(value, original_prefix, strlen(original_prefix)))
{
char newvalue[PKGCONF_ITEM_SIZE];
pkgconf_strlcpy(newvalue, prefix, sizeof newvalue);
pkgconf_strlcat(newvalue, value + strlen(original_prefix), sizeof newvalue);
pkgconf_tuple_add(client, &pkg->vars, key, newvalue, false);
}
else if (strcmp(key, client->prefix_varname) || !(client->flags & PKGCONF_PKG_PKGF_REDEFINE_PREFIX))
pkgconf_tuple_add(client, &pkg->vars, key, value, true); pkgconf_tuple_add(client, &pkg->vars, key, value, true);
else else
{ {
@ -377,6 +396,8 @@ pkgconf_pkg_new_from_file(pkgconf_client_t *client, const char *filename, FILE *
{ {
pkgconf_tuple_add(client, &pkg->vars, "orig_prefix", value, true); pkgconf_tuple_add(client, &pkg->vars, "orig_prefix", value, true);
pkgconf_tuple_add(client, &pkg->vars, key, relvalue, false); pkgconf_tuple_add(client, &pkg->vars, key, relvalue, false);
pkgconf_strlcpy(original_prefix, value, sizeof original_prefix);
pkgconf_strlcpy(prefix, relvalue, sizeof original_prefix);
} }
else else
pkgconf_tuple_add(client, &pkg->vars, key, value, true); pkgconf_tuple_add(client, &pkg->vars, key, value, true);