summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorYue Tao <Yue.Tao@windriver.com>2015-05-28 15:24:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-16 15:09:18 +0100
commit6c3c74fa8b12438569b64ba0c82837ccb80ac2ee (patch)
tree9bbd36652ee879f72d9fe73f0c4281c8870d983c /meta/recipes-devtools
parentca789f0cde40dd4ad7788238949e791bfe6b63bd (diff)
downloadpoky-6c3c74fa8b12438569b64ba0c82837ccb80ac2ee.tar.gz
expect: replace the STAGING_INCDIR with includedir
The build path is included in expect-dev rpm package. It should not set the STAGING_INCDIR statically. The includedir will be replaced with appropriate value in different stage. (From OE-Core rev: 41f74d0a05cec275243271e8e6b4dceb16e4daa4) Signed-off-by: Yue Tao <Yue.Tao@windriver.com> Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/expect/expect_5.45.bb11
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/recipes-devtools/expect/expect_5.45.bb b/meta/recipes-devtools/expect/expect_5.45.bb
index 264f00718b..3c2aab417c 100644
--- a/meta/recipes-devtools/expect/expect_5.45.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.bb
@@ -40,8 +40,7 @@ do_install_append() {
40 sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl 40 sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl
41} 41}
42 42
43EXTRA_OECONF += "--includedir=${STAGING_INCDIR} \ 43EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \
44 --with-tcl=${STAGING_LIBDIR} \
45 --with-tclinclude=${STAGING_INCDIR}/tcl8.6 \ 44 --with-tclinclude=${STAGING_INCDIR}/tcl8.6 \
46 --enable-shared \ 45 --enable-shared \
47 --enable-threads \ 46 --enable-threads \
@@ -53,10 +52,10 @@ FILES_${PN}-dbg += "${libdir}/${BPN}${PV}/.debug \
53 ${libdir}/.debug \ 52 ${libdir}/.debug \
54 " 53 "
55FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \ 54FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \
56 ${STAGING_INCDIR}/expect.h \ 55 ${includedir}/expect.h \
57 ${STAGING_INCDIR}/expect_tcl.h \ 56 ${includedir}/expect_tcl.h \
58 ${STAGING_INCDIR}/expect_comm.h \ 57 ${includedir}/expect_comm.h \
59 ${STAGING_INCDIR}/tcldbg.h \ 58 ${includedir}/tcldbg.h \
60 ${includedir}/*.h \ 59 ${includedir}/*.h \
61 " 60 "
62 61