From 9beeb3030be3e0ab6513164b785fca3ade4c90e9 Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Mon, 6 Feb 2012 15:28:19 +0000 Subject: Correct pkg-config usage to respect sysroot Direct use of pkg-config variables disregards the sysroot offset pkg-config factors into consideration with the dedicated variables: --cflags-only-I --libs-only-L these parameters exist exactly for this reason. Change-Id: Ieecf31ebe0640f64b272b84fba22701aacf8f966 Reviewed-by: Johannes Zellner Reviewed-by: Donald Carr Reviewed-by: Girish Ramakrishnan Reviewed-by: Thiago Macieira Reviewed-by: Oswald Buddenhagen --- configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 0eeaec6a1d..5df1edf6a3 100755 --- a/configure +++ b/configure @@ -5542,8 +5542,8 @@ if [ "$PLATFORM_QPA" = "yes" ]; then elif [ "$CFG_OPENGL" = "es2" ]; then #OpenGL ES 2.x if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists glesv2 2>/dev/null; then - QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --variable=includedir glesv2 2>/dev/null` - QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --variable=libdir glesv2 2>/dev/null` + QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --cflags-only-I glesv2 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` + QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --libs-only-L glesv2 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'` QMAKE_LIBS_OPENGL_ES2=`$PKG_CONFIG --libs glesv2 2>/dev/null` QMAKE_CFLAGS_OPENGL_ES2=`$PKG_CONFIG --cflags glesv2 2>/dev/null` QMakeVar set QMAKE_INCDIR_OPENGL_ES2 "$QMAKE_INCDIR_OPENGL_ES2" @@ -5597,8 +5597,8 @@ if [ "$PLATFORM_QPA" = "yes" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists wayland-client 2>/dev/null; then QMAKE_CFLAGS_WAYLAND=`$PKG_CONFIG --cflags wayland-client 2>/dev/null` QMAKE_LIBS_WAYLAND=`$PKG_CONFIG --libs wayland-client 2>/dev/null` - QMAKE_INCDIR_WAYLAND=`$PKG_CONFIG --variable=includedir wayland-client 2>/dev/null` - QMAKE_LIBDIR_WAYLAND=`$PKG_CONFIG --variable=libdir wayland-client 2>/dev/null` + QMAKE_INCDIR_WAYLAND=`$PKG_CONFIG --cflags-only-I wayland-client 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` + QMAKE_LIBDIR_WAYLAND=`$PKG_CONFIG --libs-only-L wayland-client 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'` fi if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/wayland "Wayland" $L_FLAGS $I_FLAGS $l_FLAGS $QMAKE_CFLAGS_WAYLAND $QMAKE_LIBS_WAYLAND; then CFG_WAYLAND=yes -- cgit v1.2.3