tachi
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: switch to pkgconf_client_set_sysroot_dir() and remove the last vestige of PKGCONF_PKG_PKGF_MUNGE_SYSROOT_PREFIX

feature/tap-sh
William Pitcock 2016-12-09 21:37:36 -06:00
parent a902203054
commit 6e4fd027c3
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libpkgconf/libpkgconf.h
View File

@ -173,10 +173,9 @@ void pkgconf_client_set_buildroot_dir(pkgconf_client_t *client, const char *buil
#define PKGCONF_PKG_PKGF_MERGE_PRIVATE_FRAGMENTS 0x010 #define PKGCONF_PKG_PKGF_MERGE_PRIVATE_FRAGMENTS 0x010
#define PKGCONF_PKG_PKGF_SKIP_CONFLICTS 0x020 #define PKGCONF_PKG_PKGF_SKIP_CONFLICTS 0x020
#define PKGCONF_PKG_PKGF_NO_CACHE 0x040 #define PKGCONF_PKG_PKGF_NO_CACHE 0x040
#define PKGCONF_PKG_PKGF_MUNGE_SYSROOT_PREFIX 0x080 #define PKGCONF_PKG_PKGF_SKIP_ERRORS 0x080
#define PKGCONF_PKG_PKGF_SKIP_ERRORS 0x100 #define PKGCONF_PKG_PKGF_ITER_PKG_IS_PRIVATE 0x100
#define PKGCONF_PKG_PKGF_ITER_PKG_IS_PRIVATE 0x200 #define PKGCONF_PKG_PKGF_SKIP_PROVIDES 0x200
#define PKGCONF_PKG_PKGF_SKIP_PROVIDES 0x400
#define PKGCONF_PKG_ERRF_OK 0x0 #define PKGCONF_PKG_ERRF_OK 0x0
#define PKGCONF_PKG_ERRF_PACKAGE_NOT_FOUND 0x1 #define PKGCONF_PKG_ERRF_PACKAGE_NOT_FOUND 0x1

7
main.c
View File

@ -804,12 +804,7 @@ main(int argc, char *argv[])
pkgconf_client_set_buildroot_dir(&pkg_client, builddir); pkgconf_client_set_buildroot_dir(&pkg_client, builddir);
if ((sysroot_dir = getenv("PKG_CONFIG_SYSROOT_DIR")) != NULL) if ((sysroot_dir = getenv("PKG_CONFIG_SYSROOT_DIR")) != NULL)
{ pkgconf_client_set_sysroot_dir(&pkg_client, sysroot_dir);
pkgconf_tuple_add_global(&pkg_client, "pc_sysrootdir", sysroot_dir);
global_traverse_flags |= PKGCONF_PKG_PKGF_MUNGE_SYSROOT_PREFIX;
}
else
pkgconf_tuple_add_global(&pkg_client, "pc_sysrootdir", "/");
/* at this point, global_traverse_flags should be set, so build the dir list */ /* at this point, global_traverse_flags should be set, so build the dir list */
pkgconf_pkg_dir_list_build(&pkg_client, global_traverse_flags); pkgconf_pkg_dir_list_build(&pkg_client, global_traverse_flags);