From 368b7235723ab7871fc75d6db155e683c9a75b8f Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 8 Jun 2014 11:56:58 +0100 Subject: libqpe-opie: do not poke files into the sysroot do_compile was putting headers into the sysroot (!) so that the compilation process could pick them up. This is not only bad behaviour but is also totally unnecessary; just create a directory within the work directory to put the files into and use that instead. Signed-off-by: Paul Eggleton --- recipes-opie/libqpe/libqpe-opie.inc | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'recipes-opie') diff --git a/recipes-opie/libqpe/libqpe-opie.inc b/recipes-opie/libqpe/libqpe-opie.inc index 903af8e..8f28827 100644 --- a/recipes-opie/libqpe/libqpe-opie.inc +++ b/recipes-opie/libqpe/libqpe-opie.inc @@ -20,6 +20,7 @@ python __anonymous() { } OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}" +OE_QMAKE_CXXFLAGS += "-I${S}/include" QMAKE_PROFILES = "library.pro" EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK" EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" @@ -27,24 +28,25 @@ EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" CXXFLAGS_append = " -frtti -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC" do_compile() { - mkdir -p ${STAGING_INCDIR}/qpe \ - ${STAGING_INCDIR}/qtopia \ - ${STAGING_INCDIR}/opie \ - ${STAGING_INCDIR}/opie2 \ - ${STAGING_INCDIR}/qtopia/private + TEMP_INCDIR=${S}/include/ + mkdir -p ${TEMP_INCDIR}/qpe \ + ${TEMP_INCDIR}/qtopia \ + ${TEMP_INCDIR}/opie \ + ${TEMP_INCDIR}/opie2 \ + ${TEMP_INCDIR}/qtopia/private for i in ${S}/*.h do - install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i` - install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i` - install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i` + install -m 0644 $i ${TEMP_INCDIR}/qpe/`basename $i` + install -m 0644 $i ${TEMP_INCDIR}/qtopia/`basename $i` + install -m 0644 $i ${TEMP_INCDIR}/qtopia/private/`basename $i` done for i in ${S}/backend/*.h do - install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i` - install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i` - install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i` + install -m 0644 $i ${TEMP_INCDIR}/qpe/`basename $i` + install -m 0644 $i ${TEMP_INCDIR}/qtopia/`basename $i` + install -m 0644 $i ${TEMP_INCDIR}/qtopia/private/`basename $i` done - rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia + rm -f ${TEMP_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia oe_runmake } -- cgit 1.2.3-korg