Merge from bittboy/buildroot@db180c0

package/slang/0001-slsh-libs.patch

@@ -0,0 +1,19 @@
+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>
+[Bernd: rebased against 2.3.1a]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+--- a/slsh/Makefile.in
++++ b/slsh/Makefile.in
+@@ -92,7 +92,7 @@
+ $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+    $(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) $(DLINK_FLAGS) $(INST_LIBS)
++	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh.o: $(OBJDIR_TSTAMP) slsh.c slsh.h config.h Makefile
+    cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
+ $(OBJDIR)/readline.o: $(OBJDIR_TSTAMP) readline.c slsh.h config.h Makefile

package/slang/Config.in

@@ -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

package/slang/slang.hash

@@ -0,0 +1,6 @@
+# sha1 from http://www.jedsoft.org/releases/slang/, sha256 locally computed
+sha1 a8ea7f1b5736160a94efb67b137a0f5b9916bdf2  slang-2.3.1a.tar.bz2
+sha256 54f0c3007fde918039c058965dffdfd6c5aec0bad0f4227192cc486021f08c36  slang-2.3.1a.tar.bz2
+
+# License file, locally computed
+sha256 ff05a90962e7773f8bdc47b2a9585130526039102759b524c1dffbd57cfe469b  COPYING

package/slang/slang.mk

@@ -0,0 +1,63 @@
+################################################################################
+#
+# slang
+#
+################################################################################
+
+SLANG_VERSION = 2.3.1a
+SLANG_SOURCE = slang-$(SLANG_VERSION).tar.bz2
+SLANG_SITE = http://www.jedsoft.org/releases/slang
+SLANG_LICENSE = GPL-2.0+
+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/$(NCURSES_CONFIG_SCRIPTS)
+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/$(NCURSES_CONFIG_SCRIPTS) --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))