From 26790242c55175bc7298e98ee9b6b29c80b5c468 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Fri, 11 May 2012 17:54:30 -0700 Subject: configure: save pkg-config env in qconfig.pri Store PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_LIBDIR for the usecase of cross compilation in qconfig.pri. They will get picked up by pkgConfigExecutable() in qt_functions.prf used from link_pkgconfig.prf as environment for pkg-config calls. Change-Id: I7d0de05c0bd21b435275fc26c66a80035ba30970 Reviewed-by: Girish Ramakrishnan --- configure | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 2cefb65c56..8c0002c1b8 100755 --- a/configure +++ b/configure @@ -5719,6 +5719,14 @@ QT_LIBINFIX = $QT_LIBINFIX QT_NAMESPACE = $QT_NAMESPACE EOF + +if [ -n "$PKG_CONFIG_SYSROOT_DIR" ] || [ -n "$PKG_CONFIG_LIBDIR" ]; then + echo "# pkgconfig" >> "$QTCONFIG.tmp" + echo "PKG_CONFIG_SYSROOT_DIR = $PKG_CONFIG_SYSROOT_DIR" >> "$QTCONFIG.tmp" + echo "PKG_CONFIG_LIBDIR = $PKG_CONFIG_LIBDIR" >> "$QTCONFIG.tmp" + echo >> $"$QTCONFIG.tmp" +fi + if [ -n "$CFG_SYSROOT" ]; then echo "# sysroot" >>"$QTCONFIG.tmp" echo `basename "$XQMAKESPEC"` \{ >>"$QTCONFIG.tmp" -- cgit v1.2.3