--- /usr/portage/eclass/qt4-build.eclass 2009-07-13 22:09:19.000000000 +0200 +++ qt4-build.eclass 2009-08-01 00:41:56.000000000 +0200 @@ -309,11 +309,17 @@ # @DESCRIPTION: # Compiles the code in $QT4_TARGET_DIRECTORIES build_directories() { - local dirs="$@" - for x in ${dirs}; do + sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:/usr/$(get_libdir)/qt4:g" \ + $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/linux.conf || die + + for x in "$@"; do cd "${S}"/${x} - sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:/usr/$(get_libdir)/qt4:g" $(find "${S}" -name '*.pr[io]') "${S}"/mkspecs/common/linux.conf || die - "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" + "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" \ + QMAKE_CC=$(tc-getCC) \ + QMAKE_CXX=$(tc-getCXX) \ + QMAKE_LINK=$(tc-getCXX) \ + QMAKE_STRIP= \ + || die "qmake failed" emake || die "emake failed" done }