Fix build path in expect-dev pkg

PATCH In review Kai Kang 1 participant 3 messages Jul 1, 2015 – Jul 9, 2015

lore

Share & tools

lore

Kai Kang

author

2015-07-01 03:25 UTC #0 lore raw

cover Fix build path in expect-dev pkg

The following changes since commit 410a6377493ebf3fa21045c390693f021149c241:

bitbake: tests/data: Add new data tests (2015-06-30 09:06:35 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib kangkai/expect
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/expect

Yue Tao (1):
expect: replace the STAGING_INCDIR with includedir

 meta/recipes-devtools/expect/expect_5.45.bb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Signature · 1 line

1.9.1

Kai Kang

author

2015-07-01 03:25 UTC #1 lore raw

PATCH 1/1 expect: replace the STAGING_INCDIR with includedir

From: Yue Tao <[email protected]>

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.

Signed-off-by Yue Tao <[email protected]>

Signed-off-by Kai Kang <[email protected]>

---
 meta/recipes-devtools/expect/expect_5.45.bb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

meta/recipes-devtools/expect/expect_5.45.bb +5 -6

index 264f007..3c2aab4 100644
@@ -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 \

@@ -53,10 +52,10 @@ 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}/expect.h \
+                   ${includedir}/expect_tcl.h \
+                   ${includedir}/expect_comm.h \
+                   ${includedir}/tcldbg.h \
                    ${includedir}/*.h \
                   "

Signature · 1 line

1.9.1

Kang Kai

author

2015-07-09 02:29 UTC #2 lore raw

In reply to Kai Kang

Quoted 11 lines · Kai Kang

The following changes since commit 410a6377493ebf3fa21045c390693f021149c241:
   bitbake: tests/data: Add new data tests (2015-06-30 09:06:35 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib kangkai/expect
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/expect
Yue Tao (1):
expect: replace the STAGING_INCDIR with includedir

Ping?

Quoted 4 lines

  meta/recipes-devtools/expect/expect_5.45.bb | 11 +++++------
  1 file changed, 5 insertions(+), 6 deletions(-)

Signature · 2 lines

Regards,
Neil | Kai Kang