From: Robert Lipe <robertlipe@gpsbabel.org>
Date: Tue, 19 Jan 2016 01:03:02 +0000 (-0600)
Subject: Starting with Qt 5.5, the default rpath handling changed. Add -Wl,-rpath
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~9^2~39
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cb8bc57fdfb70ff123ca0f0c726171dcb73c2382;p=gpsbabel.git

Starting with Qt 5.5, the default rpath handling changed. Add -Wl,-rpath
bits to our ld invocation as suggested at
http://lists.qt-project.org/pipermail/development/2015-September/023299.html
---

diff --git a/configure b/configure
index b86235bc3..aaba6f59b 100755
--- a/configure
+++ b/configure
@@ -4825,7 +4825,7 @@ rm -f core conftest.err conftest.$ac_objext \
       if test $QT_FW_OR_LIBS = "**Unknown**" ; then
          QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
       fi
-      QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore"
+      QT_LIBS="-Wl,-rpath, $QT_FW_OR_LIBS -F$QT_FW_OR_LIBS -framework QtCore"
       QT_INC="$QT_FW_OR_LIBS"
       QT_INC_OPT="-F"
       QT_SYSINC_OPT="-iframework"
diff --git a/configure.in b/configure.in
index d8fd5d4e3..09059f4bd 100644
--- a/configure.in
+++ b/configure.in
@@ -224,7 +224,7 @@ case "$target" in
       if test $QT_FW_OR_LIBS = "**Unknown**" ; then
          QT_FW_OR_LIBS=$($QMAKE -query QT_INSTALL_LIBS)
       fi
-      QT_LIBS="-F$QT_FW_OR_LIBS -framework QtCore"
+      QT_LIBS="-Wl,-rpath, $QT_FW_OR_LIBS -F$QT_FW_OR_LIBS -framework QtCore"
       QT_INC="$QT_FW_OR_LIBS"
       QT_INC_OPT="-F"
       QT_SYSINC_OPT="-iframework"