aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2016-06-17 13:30:30 -0700
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-06-27 16:06:56 +1200
commit44cbc64ccaee2050d1c1d5755023c0bf604615a1 (patch)
treece9696e59bd6d4c494719d5755cb78e6c2df60ba
parent7d958b928a4a38a186746fabbc0d8169dd8bb3a6 (diff)
downloadmeta-qt3-44cbc64ccaee2050d1c1d5755023c0bf604615a1.tar.gz
meta-qt3-44cbc64ccaee2050d1c1d5755023c0bf604615a1.tar.bz2
meta-qt3-44cbc64ccaee2050d1c1d5755023c0bf604615a1.zip
qt-x11-free: obey LDFLAGS2.2_M2
We need to obey LDFLAGS to get the correct hash style for external toolchains. The ideal way to deal with this would be for the build to be like the qt4 build, obeying the OE_QMAKE_ variables as defined in qmake_base, but that's not going to happen just now. The next best thing would be to pass '${CXX} ${LDFLAGS}' as the 'LINK' variable, but the plugin builds aren't using LINK, so this resorts to brute force and appends LDFLAGS to CXX. We'll eventually bump LSB support and drop qt3 anyway. Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--recipes-qt3/qt3/qt-x11-free-common.inc8
1 files changed, 7 insertions, 1 deletions
diff --git a/recipes-qt3/qt3/qt-x11-free-common.inc b/recipes-qt3/qt3/qt-x11-free-common.inc
index a788cbe..6d23848 100644
--- a/recipes-qt3/qt3/qt-x11-free-common.inc
+++ b/recipes-qt3/qt3/qt-x11-free-common.inc
@@ -20,10 +20,16 @@ QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no
EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -after INCPATH+=${STAGING_INCDIR} \
INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
- QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+ QMAKESPEC="${QMAKESPEC}" LINK="${CXX}" \
AR="${TARGET_PREFIX}ar cqs" \
MOC="${OE_QMAKE_MOC}" UIC="${OE_QMAKE_UIC}" MAKE="make -e"'
+# This isn't an ideal fix, but not everything is obeying the 'LINK' variable,
+# and the qt3 build isn't using a qmake.conf that obeys the OE_QMAKE_
+# variables. Rather than substantially reworking the qt3 build at this time,
+# just hack it. We'll eventually bump LSB support and drop qt3 anyway.
+CXX += "${LDFLAGS}"
+
do_configure() {
if [ ! -L ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++ ]; then
ln -sf ${QMAKE_MKSPEC_PATH}/linux-g++ ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++