libpkgconf: add support for Haiku

client: use BELIBRARIES

On Haiku, BELIBRARIES is the equivalent to LIBRARY_PATH on many other
systems, while LIBRARY_PATH is instead the LD_LIBRARY_PATH of Haiku.

pkg: bootstrap package search paths with Haiku's find_paths

This commit adds build_default_pkgconfig_path. The function appends
to the list given the default pkgconfig paths, and will supersede
get_default_pkgconfig_path
pull/181/head
Leorize 2018-04-03 12:46:35 +07:00 committed by William Pitcock
parent 3f753fa3dd
commit f36ccc1d91
5 changed files with 41 additions and 23 deletions

View File

@ -78,7 +78,11 @@ pkgconf_client_init(pkgconf_client_t *client, pkgconf_error_handler_func_t error
pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_INCLUDE_PATH", SYSTEM_INCLUDEDIR, &client->filter_includedirs, false); pkgconf_path_build_from_environ("PKG_CONFIG_SYSTEM_INCLUDE_PATH", SYSTEM_INCLUDEDIR, &client->filter_includedirs, false);
/* GCC uses these environment variables to define system include paths, so we should check them. */ /* GCC uses these environment variables to define system include paths, so we should check them. */
#ifdef __HAIKU__
pkgconf_path_build_from_environ("BELIBRARIES", NULL, &client->filter_libdirs, false);
#else
pkgconf_path_build_from_environ("LIBRARY_PATH", NULL, &client->filter_libdirs, false); pkgconf_path_build_from_environ("LIBRARY_PATH", NULL, &client->filter_libdirs, false);
#endif
pkgconf_path_build_from_environ("CPATH", NULL, &client->filter_includedirs, false); pkgconf_path_build_from_environ("CPATH", NULL, &client->filter_includedirs, false);
pkgconf_path_build_from_environ("C_INCLUDE_PATH", NULL, &client->filter_includedirs, false); pkgconf_path_build_from_environ("C_INCLUDE_PATH", NULL, &client->filter_includedirs, false);
pkgconf_path_build_from_environ("CPLUS_INCLUDE_PATH", NULL, &client->filter_includedirs, false); pkgconf_path_build_from_environ("CPLUS_INCLUDE_PATH", NULL, &client->filter_includedirs, false);

View File

@ -49,11 +49,12 @@ str_has_suffix(const char *str, const char *suffix)
return !strncasecmp(str + str_len - suf_len, suffix, suf_len); return !strncasecmp(str + str_len - suf_len, suffix, suf_len);
} }
static inline const char * static inline void
get_default_pkgconfig_path(char *outbuf, size_t outlen) build_default_pkgconfig_path(pkgconf_list_t* dirlist)
{ {
#ifdef _WIN32 #ifdef _WIN32
char namebuf[MAX_PATH]; char namebuf[MAX_PATH];
char outbuf[MAX_PATH];
char *p; char *p;
int sizepath = GetModuleFileName(NULL, namebuf, sizeof namebuf); int sizepath = GetModuleFileName(NULL, namebuf, sizeof namebuf);
@ -65,24 +66,35 @@ get_default_pkgconfig_path(char *outbuf, size_t outlen)
} }
p = strrchr(namebuf, '/'); p = strrchr(namebuf, '/');
if (p == NULL) if (p == NULL)
return PKG_DEFAULT_PATH; pkgconf_path_split(PKG_DEFAULT_PATH, dirlist, true);
*p = '\0'; *p = '\0';
pkgconf_strlcpy(outbuf, namebuf, outlen); pkgconf_strlcpy(outbuf, namebuf, sizeof outbuf);
pkgconf_strlcat(outbuf, "/", outlen); pkgconf_strlcat(outbuf, "/", sizeof outbuf);
pkgconf_strlcat(outbuf, "../lib/pkgconfig", outlen); pkgconf_strlcat(outbuf, "../lib/pkgconfig", sizeof outbuf);
pkgconf_strlcat(outbuf, ";", outlen); pkgconf_path_add(outbuf, dirlist, true);
pkgconf_strlcat(outbuf, namebuf, outlen); pkgconf_strlcpy(outbuf, namebuf, sizeof outbuf);
pkgconf_strlcat(outbuf, "/", outlen); pkgconf_strlcat(outbuf, "/", sizeof outbuf);
pkgconf_strlcat(outbuf, "../share/pkgconfig", outlen); pkgconf_strlcat(outbuf, "../share/pkgconfig", sizeof outbuf);
pkgconf_path_add(outbuf, dirlist, true);
return outbuf; #elif __HAIKU__
char **paths;
size_t count;
if (find_paths(B_FIND_PATH_DEVELOP_LIB_DIRECTORY, "pkgconfig", &paths, &count) == B_OK) {
for (size_t i = 0; i < count; i++)
pkgconf_path_add(paths[i], dirlist, true);
free(paths);
paths = NULL;
}
if (find_paths(B_FIND_PATH_DATA_DIRECTORY, "pkgconfig", &paths, &count) == B_OK) {
for (size_t i = 0; i < count; i++)
pkgconf_path_add(paths[i], dirlist, true);
free(paths);
paths = NULL;
}
#else #else
(void) outbuf; pkgconf_path_split(PKG_DEFAULT_PATH, dirlist, true);
(void) outlen;
#endif #endif
return PKG_DEFAULT_PATH;
} }
static const char * static const char *
@ -117,12 +129,8 @@ pkgconf_pkg_dir_list_build(pkgconf_client_t *client)
{ {
pkgconf_path_build_from_environ("PKG_CONFIG_PATH", NULL, &client->dir_list, true); pkgconf_path_build_from_environ("PKG_CONFIG_PATH", NULL, &client->dir_list, true);
if (!(client->flags & PKGCONF_PKG_PKGF_ENV_ONLY)) if (!(client->flags & PKGCONF_PKG_PKGF_ENV_ONLY) && (pkgconf_path_build_from_environ("PKG_CONFIG_LIBDIR", NULL, &client->dir_list, true)) < 1)
{ build_default_pkgconfig_path(&client->dir_list);
char pathbuf[PKGCONF_BUFSIZE];
pkgconf_path_build_from_environ("PKG_CONFIG_LIBDIR", get_default_pkgconfig_path(pathbuf, sizeof pathbuf), &client->dir_list, true);
}
} }
typedef void (*pkgconf_pkg_parser_keyword_func_t)(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, char *value); typedef void (*pkgconf_pkg_parser_keyword_func_t)(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *keyword, const size_t lineno, const ptrdiff_t offset, char *value);

View File

@ -53,6 +53,9 @@
#else #else
# define PATH_DEV_NULL "/dev/null" # define PATH_DEV_NULL "/dev/null"
# define SIZE_FMT_SPECIFIER "%zu" # define SIZE_FMT_SPECIFIER "%zu"
# ifdef __HAIKU__
# include <FindDirectory.h>
# endif
# include <dirent.h> # include <dirent.h>
# include <unistd.h> # include <unistd.h>
# include <limits.h> # include <limits.h>

View File

@ -79,7 +79,8 @@ variable_body()
keep_system_libs_body() keep_system_libs_body()
{ {
export PKG_CONFIG_PATH="${selfdir}/lib1" LIBRARY_PATH="/test/local/lib" export PKG_CONFIG_PATH="${selfdir}/lib1"
eval export "$LIBRARY_PATH_ENV"="/test/local/lib"
atf_check \ atf_check \
-o inline:"\n" \ -o inline:"\n" \
pkgconf --libs-only-L cflags-libs-only pkgconf --libs-only-L cflags-libs-only

View File

@ -22,10 +22,12 @@ done
#--- end kludge --- #--- end kludge ---
selfdir="@abs_top_srcdir@/tests" selfdir="@abs_top_srcdir@/tests"
LIBRARY_PATH_ENV="LIBRARY_PATH"
PATH_SEP=":" PATH_SEP=":"
SYSROOT_DIR="${selfdir}/test" SYSROOT_DIR="${selfdir}/test"
case "$(uname -s)" in case "$(uname -s)" in
Msys|CYGWIN*) PATH_SEP=";";; Msys|CYGWIN*) PATH_SEP=";";;
Haiku) LIBRARY_PATH_ENV="BELIBRARIES";;
esac esac
prefix="@prefix@" prefix="@prefix@"