diff options
| -rw-r--r-- | classes/qmake-base.bbclass | 2 | ||||
| -rw-r--r-- | classes/qmake.bbclass | 4 | ||||
| -rw-r--r-- | classes/qt4x11.bbclass | 2 | ||||
| -rw-r--r-- | packages/tetex/tetex_3.0.bb | 7 |
4 files changed, 10 insertions, 5 deletions
diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass index 4a360dae43..36ecfb622f 100644 --- a/classes/qmake-base.bbclass +++ b/classes/qmake-base.bbclass @@ -16,6 +16,8 @@ export OE_QMAKE_AR="${AR}" export OE_QMAKE_STRIP="${STRIP}" export OE_QMAKE_UIC="${STAGING_BINDIR}/uic" export OE_QMAKE_MOC="${STAGING_BINDIR}/moc" +export OE_QMAKE_RCC="non-existant" +export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake" export OE_QMAKE_RPATH="-Wl,-rpath-link," # default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11 diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass index 0d3f45c363..3a06b1af9f 100644 --- a/classes/qmake.bbclass +++ b/classes/qmake.bbclass @@ -47,9 +47,9 @@ qmake_do_configure() { oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" fi -#oenote "Calling 'qmake -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" +#oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" unset QMAKESPEC || true - qmake -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling qmake on $PROFILES" + ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling qmake on $PROFILES" } EXPORT_FUNCTIONS do_configure diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index d4ca0073df..f0844d81e1 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -4,6 +4,8 @@ export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt4" export OE_QMAKE_UIC="${STAGING_BINDIR}/uic4" export OE_QMAKE_MOC="${STAGING_BINDIR}/moc4" +export OE_QMAKE_RCC="${STAGING_BINDIR}/rcc4" +export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake2" export OE_QMAKE_CXXFLAGS="${CXXFLAGS}" export OE_QMAKE_INCDIR_QT="${QTDIR}/include" export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" diff --git a/packages/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb index 69bba37957..f12840fd47 100644 --- a/packages/tetex/tetex_3.0.bb +++ b/packages/tetex/tetex_3.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "console/utils" DEPENDS = "tetex-native flex gd ncurses libpng t1lib libx11 libxau libxext libxt zlib" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -PR = "r4" +PR = "r5" SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-${PV}.tar.gz \ file://configure.patch;patch=1" @@ -55,7 +55,7 @@ EOF } # NOTE: Make sure it is using _our_ libtool and nothing else :/ do_compile() { - LIBTOOL="${STAGING_BINDIR}/${HOST_SYS}/libtool" oe_runmake MAKE="${MAKE} LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool" + LIBTOOL="${STAGING_BINDIR}/${HOST_SYS}-libtool" oe_runmake MAKE="${MAKE} LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool" } # NOTE: This is really ugly. Unfortunately the teTeX people seem not to know about PREFIX... @@ -81,7 +81,8 @@ do_install() { scriptdir="${D}${bindir}" \ web2cdir="${D}${datadir}" \ kpathsea="${D}${libdir}/libkpathsea.la" \ - DESTDIR="" + DESTDIR="" \ + LIBTOOL="${STAGING_BINDIR}/${HOST_SYS}-libtool" MAKE="make -e" oe_runmake -e install } |