From 42a7eb8df61d280fed1f9cafe9588f7da6dd3f0e Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Fri, 16 Mar 2012 14:14:53 +0000 Subject: Ensure QMAKE_RFLAGSDIR is set correctly This patch ensures that additional runpaths passed to configure via the -R switch are added to the QMAKE_RFLAGSDIR variable. Previously, although runpaths provided in this way were appended to the linker options when building Qt itself, they were not appended to the QMAKE_RFLAGSDIR value written to mkspecs/qconfig.pri. This meant that the DT_RPATH attribute was set incorrectly in binaries built from projects other than Qt itself. ----------------------------------------------------------------------- Configure flags Expected value Value before this fix ----------------------------------------------------------------------- DEFAULT_RPATH DEFAULT_RPATH -no-rpath -R X DEFAULT_RPATH:X DEFAULT_RPATH -no-rpath -R X X -prefix Y Y/lib Y/lib -prefix Y -no-rpath -prefix Y -R X Y/lib:X Y/lib -prefix Y -no-rpath -R X X ----------------------------------------------------------------------- DEFAULT_RPATH = /usr/local/Qt-${QT_VERSION}/lib Change-Id: Iaf1809b528ebd249694cf41e004173e881ca48ad Reviewed-by: Thiago Macieira Reviewed-by: Oswald Buddenhagen --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 93dda6fe6c..4a53773544 100755 --- a/configure +++ b/configure @@ -6294,8 +6294,8 @@ if [ -n "$CFG_SYSROOT" ]; then echo "}" >> "$QTCONFIG.tmp" echo >> "$QTCONFIG.tmp" fi -if [ "$CFG_RPATH" = "yes" ]; then - echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp" +if [ -n "$RPATH_FLAGS" ]; then + echo "QMAKE_RPATHDIR += $RPATH_FLAGS" >> "$QTCONFIG.tmp" fi if [ -n "$QT_GCC_MAJOR_VERSION" ]; then echo "QT_GCC_MAJOR_VERSION = $QT_GCC_MAJOR_VERSION" >> "$QTCONFIG.tmp" -- cgit v1.2.3