mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

expect: replace the STAGING_INCDIR with includedir

Browse Source 
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>
This commit is contained in:
Yue Tao
2015-05-28 15:24:32 +08:00
committed by Richard Purdie
parent ca789f0cde
commit 6c3c74fa8b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/expect/expect_5.45.bb
+5 -6
View File
@@ -40,8 +40,7 @@ do_install_append() {
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} \ EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \
--with-tcl=${STAGING_LIBDIR} \
--with-tclinclude=${STAGING_INCDIR}/tcl8.6 \ --with-tclinclude=${STAGING_INCDIR}/tcl8.6 \
--enable-shared \ --enable-shared \
--enable-threads \ --enable-threads \
@@ -53,10 +52,10 @@ FILES_${PN}-dbg += "${libdir}/${BPN}${PV}/.debug \
${libdir}/.debug \ ${libdir}/.debug \
" "
FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \ FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \
${STAGING_INCDIR}/expect.h \ ${includedir}/expect.h \
${STAGING_INCDIR}/expect_tcl.h \ ${includedir}/expect_tcl.h \
${STAGING_INCDIR}/expect_comm.h \ ${includedir}/expect_comm.h \
${STAGING_INCDIR}/tcldbg.h \ ${includedir}/tcldbg.h \
${includedir}/*.h \ ${includedir}/*.h \
" "