summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYegor Yefremov <yegorslists@googlemail.com>2014-03-15 09:31:31 (GMT)
committer Peter Korsgaard <peter@korsgaard.com>2014-03-15 20:11:24 (GMT)
commite747e3a6b36e6d8b208e861593c5c7f7dcb386eb (patch)
tree0e785c27b9e66143a04e8d4a95d411cbf0817819
parent5dc0e606b554c494a76ffcc216eb8911d2d71dfa (diff)
downloadbuildroot-e747e3a6b36e6d8b208e861593c5c7f7dcb386eb.tar.gz
buildroot-e747e3a6b36e6d8b208e861593c5c7f7dcb386eb.tar.bz2
slang: bump to 2.2.4
Convert package from generic to autotools. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/slang/Config.in2
-rw-r--r--package/slang/slang.mk33
2 files changed, 7 insertions, 28 deletions
diff --git a/package/slang/Config.in b/package/slang/Config.in
index 60facbb..9d8f047 100644
--- a/package/slang/Config.in
+++ b/package/slang/Config.in
@@ -3,4 +3,4 @@ config BR2_PACKAGE_SLANG
help
Multi-platform console display library.
- http://www.s-lang.org/
+ http://www.jedsoft.org/slang/index.html
diff --git a/package/slang/slang.mk b/package/slang/slang.mk
index 8cc93dd..c66971e 100644
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -4,32 +4,11 @@
#
################################################################################
-SLANG_VERSION = 1.4.5
-SLANG_SOURCE = slang-$(SLANG_VERSION)-mini.tar.bz2
-SLANG_SITE = http://www.uclibc.org/
+SLANG_VERSION_MAJOR = 2.2
+SLANG_VERSION = $(SLANG_VERSION_MAJOR).4
+SLANG_SOURCE = slang-$(SLANG_VERSION).tar.bz2
+SLANG_SITE = ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v$(SLANG_VERSION_MAJOR)/
SLANG_INSTALL_STAGING = YES
+SLANG_MAKE = $(MAKE1)
-# We need to add -fPIC since we're busting original CFLAGS
-# that have it, see bug #3295
-define SLANG_BUILD_CMDS
- $(MAKE1) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -fPIC" \
- LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
-endef
-
-define SLANG_INSTALL_STAGING_CMDS
- $(INSTALL) -D -m 0644 $(@D)/libslang.a $(STAGING_DIR)/usr/lib/libslang.a
- $(INSTALL) -D -m 0755 $(@D)/libslang.so $(STAGING_DIR)/usr/lib/libslang.so
- $(INSTALL) -D -m 0644 $(@D)/slang.h $(STAGING_DIR)/usr/include/slang.h
- $(INSTALL) -D -m 0644 $(@D)/slcurses.h $(STAGING_DIR)/usr/include/slcurses.h
- (cd $(STAGING_DIR)/usr/lib; ln -fs libslang.so libslang.so.1)
-endef
-
-define SLANG_INSTALL_TARGET_CMDS
- $(INSTALL) -D -m 0644 $(@D)/libslang.a $(TARGET_DIR)/usr/lib/libslang.a
- $(INSTALL) -D -m 0755 $(@D)/libslang.so $(TARGET_DIR)/usr/lib/libslang.so
- $(INSTALL) -D -m 0644 $(@D)/slang.h $(TARGET_DIR)/usr/include/slang.h
- $(INSTALL) -D -m 0644 $(@D)/slcurses.h $(TARGET_DIR)/usr/include/slcurses.h
- (cd $(TARGET_DIR)/usr/lib; ln -fs libslang.so libslang.so.1)
-endef
-
-$(eval $(generic-package))
+$(eval $(autotools-package))