diff options
Diffstat (limited to 'meta/recipes-devtools/expect/expect_5.45.4.bb')
| -rw-r--r-- | meta/recipes-devtools/expect/expect_5.45.4.bb | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb index 96eacd9293..e27b0d9d71 100644 --- a/meta/recipes-devtools/expect/expect_5.45.4.bb +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb @@ -14,7 +14,7 @@ SECTION = "devel" LIC_FILES_CHKSUM = "file://license.terms;md5=fbf2de7e9102505b1439db06fc36ce5c" DEPENDS += "tcl" -RDEPENDS_${PN} = "tcl" +RDEPENDS:${PN} = "tcl" inherit autotools update-alternatives @@ -25,6 +25,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \ file://0001-expect-install-scripts-without-using-the-fixline1-tc.patch \ file://0001-Resolve-string-formatting-issues.patch \ file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \ + file://0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch \ " SRC_URI[md5sum] = "00fce8de158422f5ccd2666512329bd2" SRC_URI[sha256sum] = "49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34" @@ -34,7 +35,7 @@ UPSTREAM_CHECK_REGEX = "/Expect/(?P<pver>(\d+[\.\-_]*)+)/" S = "${WORKDIR}/${BPN}${PV}" -do_install_append() { +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}/ @@ -44,9 +45,9 @@ do_install_append() { } # Apparently the public Tcl headers are only in /usr/include/tcl8.6 -# when building for the target. -TCL_INCLUDE_PATH = "" -TCL_INCLUDE_PATH_class-target = "--with-tclinclude=${STAGING_INCDIR}/tcl8.6" +# when building for the target and nativesdk. +TCL_INCLUDE_PATH = "--with-tclinclude=${STAGING_INCDIR}/tcl8.6" +TCL_INCLUDE_PATH:class-native = "" EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \ --enable-shared \ @@ -56,12 +57,12 @@ EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \ " EXTRA_OEMAKE_install = " 'SCRIPTS=' " -ALTERNATIVE_${PN} = "mkpasswd" +ALTERNATIVE:${PN} = "mkpasswd" ALTERNATIVE_LINK_NAME[mkpasswd] = "${bindir}/mkpasswd" # Use lower priority than busybox's mkpasswd (created when built with CONFIG_CRYPTPW) ALTERNATIVE_PRIORITY[mkpasswd] = "40" -FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \ +FILES:${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \ ${includedir}/expect.h \ ${includedir}/expect_tcl.h \ ${includedir}/expect_comm.h \ @@ -69,7 +70,7 @@ FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \ ${includedir}/*.h \ " -FILES_${PN} += "${libdir}/libexpect${PV}.so \ +FILES:${PN} += "${libdir}/libexpect${PV}.so \ ${libdir}/expect${PV}/* \ " |