This patch enables the PKG_CONFIG_PATH variable in pkg-config-wrapper.
${SYSROOT} will be prepended to each element in PKG_CONFIG_PATH.Further, rules/pre/Rules.make is modified to pass PTXCONF_PKG_CONFIG_PATH as PKG_CONFIG_PATH. Thus, people can set PKG_CONFIG_PATH in a local .in file. Note: the "path search" for pkg-config at the top of pkg-config-wrapper might produce slightly incorrect results when used within ptxdist, that is when pkg-config-wrapper is called, e.g., via an absolute path name. It looks like this was meant for a version that is called pkg-config and found via $PATH itself ... Signed-off-by: Enrik Berkhan <[email protected]> --- rules/pre/Rules.make | 1 + scripts/pkg-config-wrapper | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) Index: scripts/pkg-config-wrapper =================================================================== --- scripts/pkg-config-wrapper.orig 2009-01-19 12:53:50.000000000 +0100 +++ scripts/pkg-config-wrapper 2009-01-19 12:59:05.000000000 +0100 @@ -25,7 +25,25 @@ fi export PKG_CONFIG_LIBDIR=${SYSROOT}/lib/pkgconfig:${SYSROOT}/usr/lib/pkgconfig export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 -unset PKG_CONFIG_PATH + +if [ -n "$PKG_CONFIG_PATH" ] +then + OLD_IFS=$IFS + IFS=':' + PKG_CONFIG_PATH_ARRAY=( ${PKG_CONFIG_PATH} ) + IFS=${OLD_IFS} + unset OLD_IFS + + PKG_CONFIG_PATH=${SYSROOT}${PKG_CONFIG_PATH_ARRAY[0]} + unset PKG_CONFIG_PATH_ARRAY[0] + for p in ${pkg_config_path_arr...@]} + do + PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${SYSROOT}${p} + done + + unset p + unset PKG_CONFIG_PATH_ARRAY +fi found_var=false for ((i = 1; i <= ${#}; i++)); do Index: rules/pre/Rules.make =================================================================== --- rules/pre/Rules.make.orig 2009-01-19 13:12:20.000000000 +0100 +++ rules/pre/Rules.make 2009-01-19 14:48:32.000000000 +0100 @@ -161,6 +161,7 @@ CROSS_ENV_PROGS := \ CROSS_ENV_PKG_CONFIG := \ SYSROOT="$(SYSROOT)" \ + PKG_CONFIG_PATH="$(PTXCONF_PKG_CONFIG_PATH)" \ PKG_CONFIG="$(PTXCONF_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config" CROSS_ENV_FLAGS := \ -- ptxdist mailing list [email protected]
