From 08bd3f5a3fbd69520dfde8499b22a0fbb5977a80 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 14 Nov 2017 16:57:47 +0200 Subject: expect: update to 5.45.3 Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/recipes-devtools/expect/expect_5.45.3.bb | 76 ++++++++++++++++++++++++++ meta/recipes-devtools/expect/expect_5.45.bb | 78 --------------------------- 2 files changed, 76 insertions(+), 78 deletions(-) create mode 100644 meta/recipes-devtools/expect/expect_5.45.3.bb delete mode 100644 meta/recipes-devtools/expect/expect_5.45.bb diff --git a/meta/recipes-devtools/expect/expect_5.45.3.bb b/meta/recipes-devtools/expect/expect_5.45.3.bb new file mode 100644 index 0000000000..445eca5742 --- /dev/null +++ b/meta/recipes-devtools/expect/expect_5.45.3.bb @@ -0,0 +1,76 @@ +SUMMARY = "tool for automating interactive applications according to a script" +DESCRIPTION = "Expect is a tool for automating interactive applications according to a script. \ +Following the script, Expect knows what can be expected from a program and what \ +the correct response should be. Expect is also useful for testing these same \ +applications. And by adding Tk, you can also wrap interactive applications in \ +X11 GUIs. An interpreted language provides branching and high-level control \ +structures to direct the dialogue. In addition, the user can take control and \ +interact directly when desired, afterward returning control to the script. \ +" +HOMEPAGE = "http://sourceforge.net/projects/expect/" +LICENSE = "PD" +SECTION = "devel" + +LIC_FILES_CHKSUM = "file://license.terms;md5=fbf2de7e9102505b1439db06fc36ce5c" + +DEPENDS += "tcl" +RDEPENDS_${PN} = "tcl" + +inherit autotools update-alternatives + +SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \ + file://0001-configure.in.patch \ + file://0002-tcl.m4.patch \ + file://01-example-shebang.patch \ + 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 \ + " +SRC_URI[md5sum] = "a8855cd41c1ef004b9794db9e2a57a9d" +SRC_URI[sha256sum] = "c520717b7195944a69ce1492ec82ca0ac3f3baf060804e6c5ee6d505ea512be9" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/expect/files/Expect/" +UPSTREAM_CHECK_REGEX = "/Expect/(?P(\d+[\.\-_]*)+)/" + +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 +} + +# 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" + +EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \ + --enable-shared \ + --enable-threads \ + --disable-rpath \ + ${TCL_INCLUDE_PATH} \ + " +EXTRA_OEMAKE_install = " 'SCRIPTS=' " + +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 \ + ${includedir}/expect.h \ + ${includedir}/expect_tcl.h \ + ${includedir}/expect_comm.h \ + ${includedir}/tcldbg.h \ + ${includedir}/*.h \ + " + +FILES_${PN} += "${libdir}/libexpect${PV}.so \ + ${libdir}/expect${PV}/* \ + " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/expect/expect_5.45.bb b/meta/recipes-devtools/expect/expect_5.45.bb deleted file mode 100644 index c9f5aba897..0000000000 --- a/meta/recipes-devtools/expect/expect_5.45.bb +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY = "tool for automating interactive applications according to a script" -DESCRIPTION = "Expect is a tool for automating interactive applications according to a script. \ -Following the script, Expect knows what can be expected from a program and what \ -the correct response should be. Expect is also useful for testing these same \ -applications. And by adding Tk, you can also wrap interactive applications in \ -X11 GUIs. An interpreted language provides branching and high-level control \ -structures to direct the dialogue. In addition, the user can take control and \ -interact directly when desired, afterward returning control to the script. \ -" -HOMEPAGE = "http://sourceforge.net/projects/expect/" -LICENSE = "PD" -SECTION = "devel" - -LIC_FILES_CHKSUM = "file://license.terms;md5=fbf2de7e9102505b1439db06fc36ce5c" - -DEPENDS += "tcl" -RDEPENDS_${PN} = "tcl" - -inherit autotools update-alternatives - -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/expect/Expect/${PV}/${BPN}${PV}.tar.gz \ - file://0001-configure.in.patch \ - file://0002-tcl.m4.patch \ - file://01-example-shebang.patch \ - 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 \ - " -SRC_URI[md5sum] = "44e1a4f4c877e9ddc5a542dfa7ecc92b" -SRC_URI[sha256sum] = "b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/expect/files/Expect/" -UPSTREAM_CHECK_REGEX = "/Expect/(?P(\d+[\.\-_]*)+)/" - -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 -} - -# 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" - -EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \ - --enable-shared \ - --enable-threads \ - --disable-rpath \ - ${TCL_INCLUDE_PATH} \ - " -EXTRA_OEMAKE_install = " 'SCRIPTS=' " - -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 \ - ${includedir}/expect.h \ - ${includedir}/expect_tcl.h \ - ${includedir}/expect_comm.h \ - ${includedir}/tcldbg.h \ - ${includedir}/*.h \ - " - -FILES_${PN} += "${libdir}/libexpect${PV}.so \ - ${libdir}/expect${PV}/* \ - " - -BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg