diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/slang')
6 files changed, 0 insertions, 296 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/dont-link-to-host.patch b/import-layers/yocto-poky/meta/recipes-extended/slang/slang/dont-link-to-host.patch deleted file mode 100644 index 42dba0fae..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/dont-link-to-host.patch +++ /dev/null @@ -1,16 +0,0 @@ -SLANG_INST_LIB is the location of where slang will end up, but when building for -packaging this doesn't have DESTDIR appended so can potentially link to the host -for cross builds and will trigger QA errors. - -As this is obviously wrong, delete it. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/slsh/Makefile.in b/slsh/Makefile.in -index cba9d81..4c1c370 100644 ---- a/slsh/Makefile.in -+++ b/slsh/Makefile.in -@@ -80 +80 @@ SHELL = /bin/sh --INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS) -+INST_LIBS = $(DEST_LIB_DIR) $(RPATH) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS) diff --git a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/no-x.patch b/import-layers/yocto-poky/meta/recipes-extended/slang/slang/no-x.patch deleted file mode 100644 index 7dc1602fe..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/no-x.patch +++ /dev/null @@ -1,18 +0,0 @@ -There's no need to check for the X libraries as the socket module doesn't use -anything from X. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/autoconf/configure.ac b/autoconf/configure.ac -index b61e974..a3e5db2 100644 ---- a/autoconf/configure.ac -+++ b/autoconf/configure.ac -@@ -72,3 +71,0 @@ AC_SUBST(LIB_READLINE) --# For the socket module --AC_PATH_XTRA -- ---- a/modules/Makefile.in -+++ b/modules/Makefile.in -@@ -67 +66,0 @@ ZLIB_LIB = @Z_LIB@ -lz --SOCKET_LIBS = @X_EXTRA_LIBS@ diff --git a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/run-ptest b/import-layers/yocto-poky/meta/recipes-extended/slang/slang/run-ptest deleted file mode 100644 index 39f474af3..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -make -C test runtests diff --git a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/terminfo_fixes.patch b/import-layers/yocto-poky/meta/recipes-extended/slang/slang/terminfo_fixes.patch deleted file mode 100644 index 3e6d15aa7..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/terminfo_fixes.patch +++ /dev/null @@ -1,148 +0,0 @@ -Do not use the JD_TERMCAP macro since we cannot get the terminfo from -ncurses pkg-config, but fix the macro to not reference host directories. -Also add src/test/Makefile.in so that we can use -ltermcap if we want to. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - - ---- a/autoconf/aclocal.m4 -+++ b/autoconf/aclocal.m4 -@@ -506,14 +506,10 @@ then - else - MISC_TERMINFO_DIRS="" - fi --JD_Terminfo_Dirs="$MISC_TERMINFO_DIRS \ -- /usr/lib/terminfo \ -- /usr/share/terminfo \ -- /usr/share/lib/terminfo \ -- /usr/local/lib/terminfo" -+ - TERMCAP=-ltermcap - --for terminfo_dir in $JD_Terminfo_Dirs -+for terminfo_dir in $MISC_TERMINFO_DIRS - do - if test -d $terminfo_dir - then ---- a/autoconf/configure.ac -+++ b/autoconf/configure.ac -@@ -249,7 +249,14 @@ AC_CHECK_SIZEOF(size_t) - JD_CHECK_LONG_LONG - JD_LARGE_FILE_SUPPORT - --JD_TERMCAP -+dnl Do not use JD_TERMCAP, since we cannot get terminfo from ncurses*-config anymore. -+dnl Set TERMCAP=-ltermcap and AC_DEFINE(USE_TERMCAP,1,[Define to use termcap]) -+dnl to use libtermcap. -+TERMCAP="" -+MISC_TERMINFO_DIRS="" -+AC_SUBST(TERMCAP)dnl -+AC_SUBST(MISC_TERMINFO_DIRS)dnl -+ - JD_GCC_WARNINGS - - JD_SET_OBJ_SRC_DIR(src) -@@ -364,7 +371,7 @@ AC_CONFIG_HEADER(src/sysconf.h:src/confi - dnl AC_CONFIG_SUBDIRS(demo) - - AC_OUTPUT(Makefile:autoconf/Makefile.in \ -- src/Makefile slsh/Makefile modules/Makefile demo/Makefile \ -+ src/Makefile src/test/Makefile slsh/Makefile modules/Makefile demo/Makefile \ - slang.pc:autoconf/slangpc.in \ - ) - ---- /dev/null -+++ b/src/test/Makefile.in -@@ -0,0 +1,90 @@ -+# -*- make -*- -+TEST_SCRIPTS_SLC = argv syntax scircuit eqs sscanf loops arith array strops \ -+ bstring pack stdio assoc selfload struct nspace path ifeval anytype arrmult \ -+ time utf8 except bugs list regexp method deref naninf overflow sort \ -+ longlong signal dollar req docfun debug qualif compare break multline \ -+ stack misc posixio posdir proc math -+ -+TEST_SCRIPTS_NO_SLC = autoload nspace2 prep -+ -+TEST_SCRIPTS = $(TEST_SCRIPTS_SLC) $(TEST_SCRIPTS_NO_SLC) -+ -+TEST_PGM = sltest -+MEMCHECK = valgrind --tool=memcheck --leak-check=yes --leak-resolution=med --num-callers=20 -+RUN_TEST_PGM = ./$(TEST_PGM) -+SLANGINC = .. -+SLANGLIB = ../$(ARCH)objs -+OTHER_LIBS = -lm @TERMCAP@ -+OTHER_CFLAGS = -+ -+runtests: $(TEST_PGM) cleantmp -+ @tests=""; \ -+ for test in $(TEST_SCRIPTS); \ -+ do \ -+ tests="$$tests $$test.sl"; \ -+ done; \ -+ for test in $(TEST_SCRIPTS_SLC); \ -+ do \ -+ tests="$$tests $$test.slc"; \ -+ done; \ -+ MAKERUNNING=1 ./runtests.sh $$tests -+# @touch $(TEST_PGM).c -+ -+update: $(TEST_PGM) cleantmp -+ @tests=""; \ -+ for X in $(TEST_SCRIPTS); \ -+ do \ -+ if [ ! -e lastrun/$$X.sl ] || [ $$X.sl -nt lastrun/$$X.sl ] ; \ -+ then \ -+ tests="$$tests $$X.sl"; \ -+ fi \ -+ done; \ -+ for X in $(TEST_SCRIPTS_SLC); \ -+ do \ -+ if [ ! -e lastrun/$$X.slc ] || [ $$X.sl -nt lastrun/$$X.slc ] ; \ -+ then \ -+ tests="$$tests $$X.slc"; \ -+ fi \ -+ done; \ -+ if test -n "$$tests"; \ -+ then \ -+ MAKERUNNING=1 ./runtests.sh $$tests; \ -+ fi -+# @touch $(TEST_PGM).c -+ -+memcheck_runtests: $(TEST_PGM) cleantmp -+ @echo "" -+ @echo "Running tests:" -+ @echo "" -+ -@for X in $(TEST_SCRIPTS); \ -+ do \ -+ $(MEMCHECK) --log-file=log.$${X} $(RUN_TEST_PGM) $$X.sl; \ -+ grep ERROR log.$${X}; grep 'lost: [^0]' log.$${X}; \ -+ $(MEMCHECK) --log-file=log.$${X}_u $(RUN_TEST_PGM) -utf8 $$X.sl; \ -+ grep ERROR log.$${X}_u; grep 'lost: [^0]' log.$${X}_u; \ -+ done -+# touch $(TEST_PGM).c -+ -+memcheck_runtests_slc: $(TEST_PGM) cleantmp -+ @echo "" -+ @echo "Running tests:" -+ @echo "" -+ -@for X in $(TEST_SCRIPTS_SLC); \ -+ do \ -+ $(MEMCHECK) --log-file=log.$${X}_c $(RUN_TEST_PGM) $$X.slc; \ -+ $(MEMCHECK) --log-file=log.$${X}_uc $(RUN_TEST_PGM) -utf8 $$X.slc; \ -+ done -+# touch $(TEST_PGM).c -+ -+memcheck: memcheck_runtests memcheck_runtests_slc -+ -+$(TEST_PGM): $(TEST_PGM).c assoc.c list.c $(SLANGLIB)/libslang.a -+ $(CC) $(CFLAGS) $(OTHER_CFLAGS) $(LDFLAGS) $(TEST_PGM).c -o $(TEST_PGM) -I$(SLANGINC) -L$(SLANGLIB) -lslang $(OTHER_LIBS) -+cleantmp: -+ -/bin/rm -rf tmpfile*.* tmpdir*.* -+clean: cleantmp -+ -/bin/rm -f *~ *.o *.log log.pid* *.slc log.* *.log-* -+distclean: clean -+ /bin/rm -f $(TEST_PGM) $(TEST_PGM).gcda $(TEST_PGM).gcno -+.PHONY: clean memcheck runtests memcheck_runtests_slc memcheck_runtests cleantmp -+ diff --git a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch b/import-layers/yocto-poky/meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch deleted file mode 100644 index 27a9bb87e..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 38688ee2754415cf2a1935dafb8278861b7315e7 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin <sstrogin@cisco.com> -Date: Thu, 2 Mar 2017 00:26:31 +0200 -Subject: [PATCH] test: add output in the format "result: testname" - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Stefan Strogin <sstrogin@cisco.com> ---- - src/test/runtests.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/test/runtests.sh b/src/test/runtests.sh -index a3eaad0..64f0705 100755 ---- a/src/test/runtests.sh -+++ b/src/test/runtests.sh -@@ -34,8 +34,10 @@ do - then - n_failed=`expr ${n_failed} + 1` - tests_failed="$tests_failed $testfile" -+ echo "FAIL: $testfile" - else - touch lastrun/$testfile -+ echo "PASS: $testfile" - fi - done - --- -2.11.0 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/slang/slang_2.3.2.bb b/import-layers/yocto-poky/meta/recipes-extended/slang/slang_2.3.2.bb deleted file mode 100644 index 87fd41af8..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/slang/slang_2.3.2.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] = "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" |
