From 3972c93142c4adfd3227b8d7d9a6b25774ce6929 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Thu, 15 Mar 2018 10:02:40 +0800 Subject: slang: 2.3.1a -> 2.3.2 Upgrade slang from 2.3.1a to 2.3.2. Signed-off-by: Huang Qiyu Signed-off-by: Ross Burton --- meta/recipes-extended/slang/slang_2.3.1a.bb | 81 ----------------------------- meta/recipes-extended/slang/slang_2.3.2.bb | 81 +++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 81 deletions(-) delete mode 100644 meta/recipes-extended/slang/slang_2.3.1a.bb create mode 100644 meta/recipes-extended/slang/slang_2.3.2.bb diff --git a/meta/recipes-extended/slang/slang_2.3.1a.bb b/meta/recipes-extended/slang/slang_2.3.1a.bb deleted file mode 100644 index 0585c14da5..0000000000 --- a/meta/recipes-extended/slang/slang_2.3.1a.bb +++ /dev/null @@ -1,81 +0,0 @@ -SUMMARY = "The shared library for the S-Lang extension language" - -DESCRIPTION = "S-Lang is an interpreted language and a programming library. The \ -S-Lang language was designed so that it can be easily embedded into \ -a program to provide the program with a powerful extension language. \ -The S-Lang library, provided in this package, provides the S-Lang \ -extension language. S-Lang's syntax resembles C, which makes it easy \ -to recode S-Lang procedures in C if you need to." - -HOMEPAGE = "http://www.jedsoft.org/slang/" -SECTION = "libs" -DEPENDS = "ncurses virtual/libiconv" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02" - -SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \ - file://no-x.patch \ - file://dont-link-to-host.patch \ - file://test-add-output-in-the-format-result-testname.patch \ - file://terminfo_fixes.patch \ - file://run-ptest \ - " - -SRC_URI[md5sum] = "c5235313042ed0e71ec708f7b85ec241" -SRC_URI[sha256sum] = "54f0c3007fde918039c058965dffdfd6c5aec0bad0f4227192cc486021f08c36" - -UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/" -PREMIRRORS_append = "\n http://www.jedsoft.org/releases/slang/.* http://www.jedsoft.org/releases/slang/old/ \n" - -inherit autotools-brokensep ptest -CLEANBROKEN = "1" - -EXTRA_OECONF = "--without-onig" -# There's no way to turn off rpaths and slang will -rpath to the default search -# path. Unset RPATH to stop this. -EXTRA_OEMAKE = "RPATH=''" - -PACKAGECONFIG ??= "pcre" -PACKAGECONFIG[pcre] = "--with-pcre=${STAGING_DIR_HOST}${prefix},--without-pcre,pcre" -PACKAGECONFIG[png] = "--with-png=${STAGING_DIR_HOST}${prefix},--without-png,libpng" -PACKAGECONFIG[zlib] = "--with-z=${STAGING_DIR_HOST}${prefix},--without-z,zlib" - -do_configure_prepend() { - cd ${S}/autoconf - # slang keeps configure.ac and rest of autoconf files in autoconf/ directory - # we have to go there to be able to run gnu-configize cause it expects configure.{in,ac} - # to be present. Resulting files land in autoconf/autoconf/ so we need to move them. - gnu-configize --force && mv autoconf/config.* . - # For the same reason we also need to run autoconf manually. - autoconf && mv configure .. - cd ${B} -} - -do_compile_ptest() { - oe_runmake -C src static - oe_runmake -C src/test sltest -} - -do_install_ptest() { - mkdir ${D}${PTEST_PATH}/test - for f in Makefile sltest runtests.sh *.sl *.inc; do - cp ${S}/src/test/$f ${D}${PTEST_PATH}/test/ - done - sed -e 's/\ \$(TEST_PGM)\.c\ assoc\.c\ list\.c\ \$(SLANGLIB)\/libslang\.a//' \ - -e '/\$(CC).*(TEST_PGM)/d' \ - -i ${D}${PTEST_PATH}/test/Makefile - - cp ${S}/slsh/lib/require.sl ${D}${PTEST_PATH}/test/ - sed -i 's/\.\.\/\.\.\/slsh\/lib\/require\.sl/require\.sl/' ${D}${PTEST_PATH}/test/req.sl - - cp ${S}/doc/text/slangfun.txt ${D}${PTEST_PATH}/test/ - sed -i 's/\.\.\/\.\.\/doc\/text\/slangfun\.txt/slangfun\.txt/' ${D}${PTEST_PATH}/test/docfun.sl -} - -FILES_${PN} += "${libdir}/${BPN}/v2/modules/ ${datadir}/slsh/" - -PARALLEL_MAKE = "" -PARALLEL_MAKEINST = "" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/slang/slang_2.3.2.bb b/meta/recipes-extended/slang/slang_2.3.2.bb new file mode 100644 index 0000000000..87fd41af88 --- /dev/null +++ b/meta/recipes-extended/slang/slang_2.3.2.bb @@ -0,0 +1,81 @@ +SUMMARY = "The shared library for the S-Lang extension language" + +DESCRIPTION = "S-Lang is an interpreted language and a programming library. The \ +S-Lang language was designed so that it can be easily embedded into \ +a program to provide the program with a powerful extension language. \ +The S-Lang library, provided in this package, provides the S-Lang \ +extension language. S-Lang's syntax resembles C, which makes it easy \ +to recode S-Lang procedures in C if you need to." + +HOMEPAGE = "http://www.jedsoft.org/slang/" +SECTION = "libs" +DEPENDS = "ncurses virtual/libiconv" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02" + +SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \ + file://no-x.patch \ + file://dont-link-to-host.patch \ + file://test-add-output-in-the-format-result-testname.patch \ + file://terminfo_fixes.patch \ + file://run-ptest \ + " + +SRC_URI[md5sum] = "c2d5a7aa0246627da490be4e399c87cb" +SRC_URI[sha256sum] = "fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a" + +UPSTREAM_CHECK_URI = "http://www.jedsoft.org/releases/slang/" +PREMIRRORS_append = "\n http://www.jedsoft.org/releases/slang/.* http://www.jedsoft.org/releases/slang/old/ \n" + +inherit autotools-brokensep ptest +CLEANBROKEN = "1" + +EXTRA_OECONF = "--without-onig" +# There's no way to turn off rpaths and slang will -rpath to the default search +# path. Unset RPATH to stop this. +EXTRA_OEMAKE = "RPATH=''" + +PACKAGECONFIG ??= "pcre" +PACKAGECONFIG[pcre] = "--with-pcre=${STAGING_DIR_HOST}${prefix},--without-pcre,pcre" +PACKAGECONFIG[png] = "--with-png=${STAGING_DIR_HOST}${prefix},--without-png,libpng" +PACKAGECONFIG[zlib] = "--with-z=${STAGING_DIR_HOST}${prefix},--without-z,zlib" + +do_configure_prepend() { + cd ${S}/autoconf + # slang keeps configure.ac and rest of autoconf files in autoconf/ directory + # we have to go there to be able to run gnu-configize cause it expects configure.{in,ac} + # to be present. Resulting files land in autoconf/autoconf/ so we need to move them. + gnu-configize --force && mv autoconf/config.* . + # For the same reason we also need to run autoconf manually. + autoconf && mv configure .. + cd ${B} +} + +do_compile_ptest() { + oe_runmake -C src static + oe_runmake -C src/test sltest +} + +do_install_ptest() { + mkdir ${D}${PTEST_PATH}/test + for f in Makefile sltest runtests.sh *.sl *.inc; do + cp ${S}/src/test/$f ${D}${PTEST_PATH}/test/ + done + sed -e 's/\ \$(TEST_PGM)\.c\ assoc\.c\ list\.c\ \$(SLANGLIB)\/libslang\.a//' \ + -e '/\$(CC).*(TEST_PGM)/d' \ + -i ${D}${PTEST_PATH}/test/Makefile + + cp ${S}/slsh/lib/require.sl ${D}${PTEST_PATH}/test/ + sed -i 's/\.\.\/\.\.\/slsh\/lib\/require\.sl/require\.sl/' ${D}${PTEST_PATH}/test/req.sl + + cp ${S}/doc/text/slangfun.txt ${D}${PTEST_PATH}/test/ + sed -i 's/\.\.\/\.\.\/doc\/text\/slangfun\.txt/slangfun\.txt/' ${D}${PTEST_PATH}/test/docfun.sl +} + +FILES_${PN} += "${libdir}/${BPN}/v2/modules/ ${datadir}/slsh/" + +PARALLEL_MAKE = "" +PARALLEL_MAKEINST = "" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg