* [PATCH] expect: install header files in usual location
@ 2015-04-15 14:07 Yocto User
2015-04-15 14:51 ` Richard Purdie
0 siblings, 1 reply; 4+ messages in thread
From: Yocto User @ 2015-04-15 14:07 UTC (permalink / raw)
To: openembedded-core
This patch resolves [Bug 7552] where the headers for the expect library
were installed into the wrong location.
---
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"
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} \
"
FILES_${PN} += "${libdir}/libexpect${PV}.so \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] expect: install header files in usual location
2015-04-15 14:07 [PATCH] expect: install header files in usual location Yocto User
@ 2015-04-15 14:51 ` Richard Purdie
2015-04-15 15:02 ` Gary Thomas
0 siblings, 1 reply; 4+ messages in thread
From: Richard Purdie @ 2015-04-15 14:51 UTC (permalink / raw)
To: Yocto User; +Cc: openembedded-core
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]
>
> ---
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] expect: install header files in usual location
2015-04-15 14:51 ` Richard Purdie
@ 2015-04-15 15:02 ` Gary Thomas
2015-04-15 16:44 ` Yocto User
0 siblings, 1 reply; 4+ messages in thread
From: Gary Thomas @ 2015-04-15 15:02 UTC (permalink / raw)
To: openembedded-core
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
------------------------------------------------------------
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] expect: install header files in usual location
2015-04-15 15:02 ` Gary Thomas
@ 2015-04-15 16:44 ` Yocto User
0 siblings, 0 replies; 4+ messages in thread
From: Yocto User @ 2015-04-15 16:44 UTC (permalink / raw)
To: openembedded-core
On 04/15/2015 11:02 AM, Gary Thomas wrote:
> 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
>>
>
Thank you for the feedback. When I started addressing your comments, I
realized expect wasn't being packaged quite right. There are various
script files from the example directory that aren't strictly part of the
base package. I used the debian distribution for reference and found
that they place the extra scripts into the -dev package. This new
version simplifies the recipe and fixes these packaging issues.
This patch resolves [YOCTO #7552] where the headers for the expect
library were installed into the wrong location.
Signed-off-by: Mitchell White <mitchell.white@thalesdsi.com>
---
meta/recipes-devtools/expect/expect_5.45.bb | 36
+++++++++++----------------
1 file changed, 14 insertions(+), 22 deletions(-)
diff --git a/meta/recipes-devtools/expect/expect_5.45.bb
b/meta/recipes-devtools/expect/expect_5.45.bb
index 264f007..87babd4 100644
--- a/meta/recipes-devtools/expect/expect_5.45.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.bb
@@ -26,40 +26,32 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \
file://01-example-shebang.patch \
file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \
"
+
SRC_URI[md5sum] = "44e1a4f4c877e9ddc5a542dfa7ecc92b"
SRC_URI[sha256sum] =
"b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040"
S = "${WORKDIR}/${BPN}${PV}"
do_install_append() {
- install -d ${D}${libdir}
- install -m 0755 ${D}${libdir}/expect${PV}/libexpect*.so
${D}${libdir}/
- install -m 0755 ${S}/fixline1 ${D}${libdir}/expect${PV}/
- install -m 0755 ${S}/example/* ${D}${libdir}/expect${PV}/
- rm ${D}${libdir}/expect${PV}/libexpect*.so
- sed -e 's|$dir|${libdir}|' -i
${D}${libdir}/expect${PV}/pkgIndex.tcl
+ 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 \
--disable-rpath \
"
-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 \
- "
+FILES_${PN}-dbg += "\
+ ${libdir}/expect${PV}/.debug \
+ "
+
+FILES_${PN}-dev += "\
+ ${bindir} \
+ "
-FILES_${PN} += "${libdir}/libexpect${PV}.so \
- ${libdir}/expect${PV}/* \
- "
+FILES_${PN} = "\
+ ${bindir}/expect \
+ ${libdir}/expect${PV} \
+ "
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-04-15 16:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-15 14:07 [PATCH] expect: install header files in usual location Yocto User
2015-04-15 14:51 ` Richard Purdie
2015-04-15 15:02 ` Gary Thomas
2015-04-15 16:44 ` Yocto User
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.