[OE-core] [PATCH] expect: install header files in usual location

[Gary Thomas]

On 2015-04-15 08:51, Richard Purdie wrote:
> On Wed, 2015-04-15 at 10:07 -0400, Yocto User wrote:
>> This patch resolves [Bug 7552] where the headers for the expect library
>> were installed into the wrong location.
>
> Few minor comments/tweaks needed:
>
> The correct form for bug numbers is:
>
> [YOCTO #7552]
>
>>

Also, needs a Signed-off-by line (with a real name)

>> ---
>>    meta/recipes-devtools/expect/expect_5.45.bb |   12 ++++--------
>>    1 file changed, 4 insertions(+), 8 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/expect/expect_5.45.bb
>> b/meta/recipes-devtools/expect/expect_5.45.bb
>> index 264f007..4129ab1 100644
>> --- a/meta/recipes-devtools/expect/expect_5.45.bb
>> +++ b/meta/recipes-devtools/expect/expect_5.45.bb
>> @@ -18,7 +18,7 @@ RDEPENDS_${PN} = "tcl"
>>
>>    inherit autotools
>>
>> -PR = "r1"
>> +PR = "r2"
>
> No need to bump PR now.
>
>>    SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
>>               file://0001-configure.in.patch \
>> @@ -40,8 +40,7 @@ do_install_append() {
>>            sed -e 's|$dir|${libdir}|' -i
>> ${D}${libdir}/expect${PV}/pkgIndex.tcl
>>    }
>>
>> -EXTRA_OECONF += "--includedir=${STAGING_INCDIR} \
>> -                 --with-tcl=${STAGING_LIBDIR} \
>> +EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \
>>                     --with-tclinclude=${STAGING_INCDIR}/tcl8.6 \
>>                     --enable-shared \
>>                     --enable-threads \
>> @@ -52,12 +51,9 @@ EXTRA_OEMAKE_install = " 'SCRIPTS=' "
>>    FILES_${PN}-dbg += "${libdir}/${BPN}${PV}/.debug \
>>                        ${libdir}/.debug \
>>                       "
>> +
>>    FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \
>> -                   ${STAGING_INCDIR}/expect.h \
>> -                   ${STAGING_INCDIR}/expect_tcl.h \
>> -                   ${STAGING_INCDIR}/expect_comm.h \
>> -                   ${STAGING_INCDIR}/tcldbg.h \
>> -                   ${includedir}/*.h \
>> +                   ${includedir} \
>>                      "
>
> Isn't this included in FILES_${PN}-dev by default?
>
> Cheers,
>
> Richard
>

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------