Move all to deprecated folder.

This commit is contained in:
2016-11-16 21:57:57 +01:00
parent 01738a7684
commit 05de7d6c04
9777 changed files with 0 additions and 0 deletions

View File

@@ -0,0 +1,17 @@
Link against sources instead of installation paths that aren't DESTDIRed.
Patch taken from gentoo portage, upstream status unknown, author
probably Diego Pettenò.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
--- a/slsh/Makefile.in
+++ b/slsh/Makefile.in
@@ -80,7 +80,7 @@
$(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS)
$(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(INST_LIBS)
+ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(SRC_LIBS)
$(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.h config.h Makefile
cd $(OBJDIR) && $(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) $(SRCDIR)/slsh.c
$(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile

View File

@@ -0,0 +1,120 @@
Enable a statically-linked version of slsh to be built and installed
Adapt an upstream patch to make it apply on 2.3.0. Unnecessary changes
have been ignored.
Repository: git://git.jedsoft.org/git/slang.git
Commit ID: 3796db6fb94a2fc7fe2fb0b6918501b69a4d3a02
Author: John E. Davis <jed@jedsoft.org>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
diff -rup a/autoconf/Makefile.in b/autoconf/Makefile.in
--- a/autoconf/Makefile.in 2014-09-18 04:02:24.000000000 +0100
+++ b/autoconf/Makefile.in 2014-12-08 11:59:30.879313080 +0000
@@ -41,16 +41,19 @@ src/Makefile: configure src/Makefile.in
#
makefiles: Makefile slsh/Makefile modules/Makefile src/Makefile
help:
- @echo "make install : install a shared version of the library"
- @echo "make install-static : install a static version"
- @echo "make install-all : install both shared and static versions"
- @echo "make check : Build the library and run the regression tests"
+ @echo "make install ==> shared version of the library, slsh and modules"
+ @echo "make install-static ==> static version of the library and slsh; no modules"
+ @echo "make install-all ==> shared/static versions of the library/modules + shared slsh."
+ @echo "make install-modules ==> install the modules"
+ @echo "make check ==> Build the library and run the regression tests"
slang.pc: configure autoconf/slangpc.in
@echo "slang.pc needs to be updated -- rerun configure"
@exit 1
static: makefiles slang.pc
cd src; $(MAKE) static
- cd slsh; $(MAKE) all
+ cd slsh; $(MAKE) static
+modules:
+ cd modules; $(MAKE) all
elf: makefiles slang.pc
cd src; $(MAKE) elf
cd slsh; $(MAKE) all
@@ -73,10 +76,11 @@ clean:
cd demo; $(MAKE) clean
install-static:
cd src; $(MAKE) install-static
+ cd slsh; $(MAKE) install-static
install-pkgconfig: slang.pc
$(MKINSDIR) $(DEST_PKGCONFIGDIR)
$(INSTALL_DATA) slang.pc $(DEST_PKGCONFIGDIR)/
-install-elf:
+install-elf: install-pkgconfig
cd src; $(MAKE) install-elf
@echo Now installing slsh
cd slsh; $(MAKE) install
@@ -86,7 +90,10 @@ install-elf:
@echo "On some systems, e.g., linux, you may also have to run ldconfig."
@echo ""
install: install-elf install-pkgconfig
-install-all: install-elf install-static install-pkgconfig
+install-all: install-elf
+ cd src; $(MAKE) install-static
+install-modules:
+ cd modules; $(MAKE) install
install-links:
cd src; $(MAKE) install-links
#
diff -rup a/slsh/Makefile.in b/slsh/Makefile.in
--- a/slsh/Makefile.in 2014-12-08 11:52:51.303284637 +0000
+++ b/slsh/Makefile.in 2014-12-08 12:06:44.811939732 +0000
@@ -16,7 +16,8 @@ SLANG_INST_INC = -I@includedir@
SLANG_INST_LIB = -L$(INST_LIB_DIR)
#---------------------------------------------------------------------------
SLANG_SRCINC = -I@SRCDIR@
-SLANG_SRCLIB = -L@ELFDIR@
+SLANG_ELFLIB = -L@ELFDIR@# for dynamically linked
+SLANG_OBJLIB = -L@OBJDIR@# for statically linked
#---------------------------------------------------------------------------
OTHER_LIBS = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
RPATH = @RPATH@
@@ -73,10 +74,12 @@ INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(S
DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
-DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
-DSLSH_PATH_ENV='$(SLSH_PATH_ENV)'
-SRC_LIBS = $(SLANG_SRCLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
+SRC_LIBS = $(SLANG_ELFLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
+STATIC_SRC_LIBS = $(SLANG_OBJLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
#
all: $(OBJDIR)/slsh_exe
slsh: $(OBJDIR)/slsh
+static: $(OBJDIR)/slsh_static
$(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS)
$(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
@@ -85,6 +88,8 @@ $(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.
cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
$(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile
cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) -DUSE_GNU_READLINE=$(GNU_READLINE) $(SRCDIR)/readline.c
+$(OBJDIR)/slsh_static: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_static $(LDFLAGS) $(STATIC_SRC_LIBS)
$(OBJDIR):
-$(MKINSDIR) $(OBJDIR)
config.h: ../src/config.h
@@ -151,6 +156,12 @@ install: slsh install_directories instal
$(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/
echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc
$(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/
+install-static: static install_directories install_lib_files install_rline_files \
+ install_scripts install_help install_docs
+ $(INSTALL) $(OBJDIR)/slsh_static $(DEST_BIN_DIR)/slsh
+ $(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/
+ echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc
+ $(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/
#---------------------------------------------------------------------------
# Housekeeping
#---------------------------------------------------------------------------
@@ -161,5 +172,5 @@ distclean: clean
#
.PHONY: all clean distclean symlinks slsh install install_directories \
install_lib_files install_rline_files install_scripts install_help \
- install_docs
+ install_docs install-static static

View File

@@ -0,0 +1,114 @@
Disable module support in the statically linked version of slsh
Adapt an upstream patch to make it apply on 2.3.0. Unnecessary changes
have been ignored.
Repository: git://git.jedsoft.org/git/slang.git
Commit ID: 997c85f5cdb19802a5c97afe44e366a60f94a069
Author: John E. Davis <jed@jedsoft.org>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
diff -rup a/slsh/Makefile.in b/slsh/Makefile.in
--- a/slsh/Makefile.in 2014-12-09 10:04:44.084899944 +0000
+++ b/slsh/Makefile.in 2014-12-09 10:16:11.545897275 +0000
@@ -1,9 +1,11 @@
#-*-sh-*-
CC = @CC@
CFLAGS = @CFLAGS@ @SLANG_DLL_CFLAGS@
-LDFLAGS = @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
+LDFLAGS = @LDFLAGS@
+DLINK_FLAGS = @DYNAMIC_LINK_FLAGS@
CONFIG_DIR = @CONFIG_DIR@
OBJDIR = $(ARCH)objs
+SOBJDIR = static_objs
SRCDIR = $(CONFIG_DIR)/slsh
#---------------------------------------------------------------------------
# Installation location of the slang library
@@ -19,7 +21,8 @@ SLANG_SRCINC = -I@SRCDIR@
SLANG_ELFLIB = -L@ELFDIR@# for dynamically linked
SLANG_OBJLIB = -L@OBJDIR@# for statically linked
#---------------------------------------------------------------------------
-OTHER_LIBS = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
+DYNAMIC_LIBS = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
+STATIC_LIBS = @TERMCAP@ @LIBS@ @M_LIB@
RPATH = @RPATH@
#----------------------------------------------------------------------------
INSTALL = @INSTALL@
@@ -69,29 +72,37 @@ DEST_SLSH_DOC_DIR= $(DESTDIR)$(SLSH_DOC_
#----------------------------------------------------------------------------
@SET_MAKE@
SHELL = /bin/sh
-#INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS)
-INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
+INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
-DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
-DSLSH_PATH_ENV='$(SLSH_PATH_ENV)'
-SRC_LIBS = $(SLANG_ELFLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
-STATIC_SRC_LIBS = $(SLANG_OBJLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
+SDEFS = $(DEFS) -DSLSH_STATIC
+SRC_LIBS = $(SLANG_ELFLIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
+STATIC_SRC_LIBS = $(SLANG_OBJLIB) -lslang $(READLINE_LIB) $(STATIC_LIBS)
#
all: $(OBJDIR)/slsh_exe
slsh: $(OBJDIR)/slsh
-static: $(OBJDIR)/slsh_static
$(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS)
+ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
$(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(SRC_LIBS)
+ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
$(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.h config.h Makefile
cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
$(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile
cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) -DUSE_GNU_READLINE=$(GNU_READLINE) $(SRCDIR)/readline.c
-$(OBJDIR)/slsh_static: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_static $(LDFLAGS) $(STATIC_SRC_LIBS)
$(OBJDIR):
-$(MKINSDIR) $(OBJDIR)
+#
+static: $(SOBJDIR)/slsh
+$(SOBJDIR)/slsh: $(SOBJDIR)/slsh.o $(SOBJDIR)/readline.o
+ $(CC) $(CFLAGS) $(SOBJDIR)/slsh.o $(SOBJDIR)/readline.o -o $(SOBJDIR)/slsh $(LDFLAGS) $(STATIC_SRC_LIBS)
+$(SOBJDIR)/slsh.o: $(SOBJDIR) slsh.c slsh.h config.h Makefile
+ cd $(SOBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(SDEFS) $(SRCDIR)/slsh.c
+$(SOBJDIR)/readline.o: $(SOBJDIR) readline.c slsh.h config.h Makefile
+ cd $(SOBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(SDEFS) -DUSE_GNU_READLINE=$(GNU_READLINE) $(SRCDIR)/readline.c
+$(SOBJDIR):
+ -$(MKINSDIR) $(SOBJDIR)
+#
config.h: ../src/config.h
cp ../src/config.h .
install_directories:
@@ -158,7 +169,7 @@ install: slsh install_directories instal
$(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/
install-static: static install_directories install_lib_files install_rline_files \
install_scripts install_help install_docs
- $(INSTALL) $(OBJDIR)/slsh_static $(DEST_BIN_DIR)/slsh
+ $(INSTALL) $(SOBJDIR)/slsh $(DEST_BIN_DIR)/
$(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/
echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc
$(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/
@@ -167,6 +178,7 @@ install-static: static install_directori
#---------------------------------------------------------------------------
clean:
-/bin/rm -f *~ $(OBJDIR)/slsh.o $(OBJDIR)/readline.o $(OBJDIR)/slsh $(OBJDIR)/slsh_exe scripts/*~ lib/*~
+ -/bin/rm -f $(SOBJDIR)/slsh.o $(SOBJDIR)/readline.o $(SOBJDIR)/slsh $(SOBJDIR)/slsh_exe
distclean: clean
-/bin/rm -f Makefile config.h
#
diff -rup a/slsh/slsh.c b/slsh/slsh.c
--- a/slsh/slsh.c 2014-09-18 04:02:24.000000000 +0100
+++ b/slsh/slsh.c 2014-12-09 10:17:04.602824146 +0000
@@ -514,7 +514,9 @@ int main (int argc, char **argv)
if ((-1 == SLang_init_all ())
|| (-1 == SLang_init_array_extra ())
+#ifndef SLSH_STATIC
|| (-1 == SLang_init_import ()) /* dynamic linking */
+#endif
|| (-1 == SLadd_intrin_fun_table (Intrinsics, NULL))
|| (-1 == slsh_init_readline_intrinsics ()))
{

View File

@@ -0,0 +1,47 @@
From 055b02cf98ab9b7301988c3be2d277f262f0957e Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 18 Nov 2015 23:12:15 +0100
Subject: [PATCH] Rename posix_close() function to posix_close_slfile()
posix_close() is a function that will be implemented as part of an
upcoming of the POSIX standard. For this reason, the musl C library
has already started implementing this function call. Unfortunately,
since slang already defines a function with the same name, it cannot
build properly with the musl C library.
This commit fixes that by renaming the slang function to
posix_close_slfile().
This patch has been taken from the Alpine Linux repository, at
http://git.alpinelinux.org/cgit/aports/plain/main/slang/musl-fix-posix_close-clash.patch.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
src/slposio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/slposio.c b/src/slposio.c
index 94f20dd..475e2c9 100644
--- a/src/slposio.c
+++ b/src/slposio.c
@@ -372,7 +372,7 @@ static int posix_close_fd (int *fd)
return 0;
}
-static int posix_close (SLFile_FD_Type *f)
+static int posix_close_slfile (SLFile_FD_Type *f)
{
int status = do_close (f);
@@ -1011,7 +1011,7 @@ static SLang_Intrin_Fun_Type Fd_Name_Table [] =
MAKE_INTRINSIC_2("write", posix_write, V, F, B),
MAKE_INTRINSIC_1("dup_fd", posix_dup, V, F),
MAKE_INTRINSIC_2("dup2_fd", posix_dup2, I, F, I),
- MAKE_INTRINSIC_1("close", posix_close, I, F),
+ MAKE_INTRINSIC_1("close", posix_close_slfile, I, F),
MAKE_INTRINSIC_1("_close", posix_close_fd, I, I),
#if defined(TTYNAME_R)
MAKE_INTRINSIC_0("ttyname", posix_ttyname, V),
--
2.6.3

View File

@@ -0,0 +1,7 @@
config BR2_PACKAGE_SLANG
bool "slang"
depends on BR2_USE_MMU # fork()
help
Multi-platform console display library.
http://www.jedsoft.org/slang/index.html

View File

@@ -0,0 +1,2 @@
# From http://www.jedsoft.org/releases/slang/
sha1 c3270b58a58e6cbfd47f0a6e3d2194dd9e7c7d14 slang-2.3.0.tar.gz

View File

@@ -0,0 +1,62 @@
################################################################################
#
# slang
#
################################################################################
SLANG_VERSION = 2.3.0
SLANG_SITE = http://www.jedsoft.org/releases/slang
SLANG_LICENSE = GPLv2+
SLANG_LICENSE_FILES = COPYING
SLANG_INSTALL_STAGING = YES
SLANG_CONF_OPTS = --with-onig=no
SLANG_MAKE = $(MAKE1)
# Racy and we don't have/do libtermcap
define SLANG_DISABLE_TERMCAP
$(SED) '/^TERMCAP=/s:=.*:=:' $(@D)/configure
endef
SLANG_POST_PATCH_HOOKS += SLANG_DISABLE_TERMCAP
# Absolute path hell, sigh...
ifeq ($(BR2_PACKAGE_LIBPNG),y)
SLANG_CONF_OPTS += --with-png=$(STAGING_DIR)/usr
SLANG_DEPENDENCIES += libpng
else
SLANG_CONF_OPTS += --with-png=no
endif
ifeq ($(BR2_PACKAGE_PCRE),y)
SLANG_CONF_OPTS += --with-pcre=$(STAGING_DIR)/usr
SLANG_DEPENDENCIES += pcre
else
SLANG_CONF_OPTS += --with-pcre=no
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
SLANG_CONF_OPTS += --with-z=$(STAGING_DIR)/usr
SLANG_DEPENDENCIES += zlib
else
SLANG_CONF_OPTS += --with-z=no
endif
ifeq ($(BR2_PACKAGE_NCURSES),y)
SLANG_DEPENDENCIES += ncurses
SLANG_CONF_ENV += ac_cv_path_nc5config=$(STAGING_DIR)/usr/bin/ncurses5-config
else
SLANG_CONF_OPTS += ac_cv_path_nc5config=no
endif
ifeq ($(BR2_PACKAGE_READLINE),y)
SLANG_CONF_OPTS += --with-readline=gnu
SLANG_DEPENDENCIES += readline
ifeq ($(BR2_STATIC_LIBS),y)
SLANG_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/ncurses5-config --libs`"
endif
endif
ifeq ($(BR2_STATIC_LIBS),y)
SLANG_MAKE_OPTS = static
SLANG_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-static
SLANG_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-static
endif
$(eval $(autotools-package))