diff options
Diffstat (limited to 'recipes-qt3/qt3/qt-x11-free-common.inc')
-rw-r--r-- | recipes-qt3/qt3/qt-x11-free-common.inc | 8 |
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++ |