[oe] [PATCH 13/13] fontforge: avoid cloning uthash during do_compile

[Andreas Müller]

On Fri, Oct 30, 2015 at 11:01 PM, Khem Raj <raj.khem at gmail.com> wrote:
> On Fri, Oct 30, 2015 at 2:24 PM, Andreas Müller
> <schnitzeltony at googlemail.com> wrote:
>> On Fri, Oct 30, 2015 at 10:02 PM, Khem Raj <raj.khem at gmail.com> wrote:
>>> On Fri, Oct 30, 2015 at 5:13 AM, Andreas Müller
>>> <schnitzeltony at googlemail.com> wrote:
>>>> Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
>>>> ---
>>>>  meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb | 11 +++++++++--
>>>>  1 file changed, 9 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb
>>>> index eb40eaa..21f955f 100644
>>>> --- a/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb
>>>> +++ b/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb
>>>> @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
>>>>      file://LICENSE;md5=3f922b42ed0033fa0fd4cd3268f6429c \
>>>>  "
>>>>
>>>> -DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool"
>>>> +DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool uthash"
>>>>  DEPENDS_append_class-target = " libxi"
>>>>
>>>>  inherit bootstrap pkgconfig pythonnative distro_features_check
>>>> @@ -20,7 +20,14 @@ S = "${WORKDIR}/git"
>>>>
>>>>  EXTRA_OECONF_append_class-native = " with_x=no --disable-python-extension --disable-python-scripting"
>>>>
>>>> -EXTRA_OEMAKE = "CFLAGS='${CFLAGS} -I${B}/uthash/src'"
>>>> +do_configure_prepend() {
>>>> +    # uthash sources are expected in uthash/src
>>>> +    currdir=`pwd`
>>>> +    cd ${S}
>>>> +    mkdir -p uthash/src
>>>> +    cp ${STAGING_INCDIR}/ut*.h uthash/src
>>>
>>> why not teach the component's build system to refer it from sysroot
>>> and avoid copying this.
>> Simple answer: This solution is far more simple: Headers are exactly
>> there where Makefile would put them by cloning. Have no idea how many
>> files expect a fixed location for the uthash headers.
>>
>
> whereever they are used in sources use #include <foo.h>
> and make sure that it respects -I$(STAGING_INCDIR) that should do it.
>
I know for sure - but because of this is done by patches this might
cause additional maintenance when updating to next version of
fontforge. But let's stop this here - Seems important to you to fix an
error which nobody has detected before in a very clean way so I will
look into that and probably send V2.

Andreas