Skip to contentSkip to conversation

slang: bump to 2.2.4

PATCH New yegorslists at googlemail.com 2 participants 3 messages Mar 14, 2014

lore
Share & tools
lore

yegorslists at googlemail.com

author
#0 lore raw

PATCH 1/1 slang: bump to 2.2.4

From: Yegor Yefremov <[email protected]>

Convert package from generic to autotools.

Signed-off-by Yegor Yefremov <[email protected]>
---
 package/slang/Config.in |    2 +-
 package/slang/slang.mk  |   31 ++++---------------------------
 2 files changed, 5 insertions(+), 28 deletions(-)
package/slang/Config.in +1 -1
index 60facbb..9d8f047 100644
@@ -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
package/slang/slang.mk +4 -27
index 8cc93dd..2364e71 100644
@@ -4,32 +4,9 @@
 #
 ################################################################################
 
-SLANG_VERSION = 1.4.5
-SLANG_SOURCE = slang-$(SLANG_VERSION)-mini.tar.bz2
-SLANG_SITE = http://www.uclibc.org/
+SLANG_VERSION = 2.2.4
+SLANG_SITE = ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/
 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))
Signature · 1 line
1.7.7
#1 lore raw

PATCH 1/1 slang: bump to 2.2.4

Hi Yegor,

Quoted 25 lines

From: Yegor Yefremov <[email protected]>

Convert package from generic to autotools.

Signed-off-by Yegor Yefremov <[email protected]>
---
  package/slang/Config.in |    2 +-
  package/slang/slang.mk  |   31 ++++---------------------------
  2 files changed, 5 insertions(+), 28 deletions(-)
package/slang/Config.in +1 -1
index 60facbb..9d8f047 100644
@@ -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
package/slang/slang.mk +0 -0
index 8cc93dd..2364e71 100644

package/slang/slang.mk line 8

Quoted 8 lines
package/slang/slang.mk +2 -3
@@ -4,32 +4,9 @@
  #
  ################################################################################
 
-SLANG_VERSION = 1.4.5
-SLANG_SOURCE = slang-$(SLANG_VERSION)-mini.tar.bz2
-SLANG_SITE = http://www.uclibc.org/
+SLANG_VERSION = 2.2.4
+SLANG_SITE = ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/

My suggestion is:

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)/

Regards,
Jerzy

Quoted 28 lines
package/slang/slang.mk +2 -24
  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))
author
#2 lore raw

PATCH 1/1 slang: bump to 2.2.4

Hi Jerzy,

Quoted 40 lines · Jerzy Grzegorek

Hi Yegor,

Quoted 24 lines

From: Yegor Yefremov <[email protected]>

Convert package from generic to autotools.

Signed-off-by Yegor Yefremov <[email protected]>
---
  package/slang/Config.in |    2 +-
  package/slang/slang.mk  |   31 ++++---------------------------
  2 files changed, 5 insertions(+), 28 deletions(-)
package/slang/Config.in +1 -0
index 60facbb..9d8f047 100644
@@ -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
package/slang/slang.mk +0 -0
index 8cc93dd..2364e71 100644

package/slang/slang.mk line 9

Quoted 8 lines
package/slang/slang.mk +2 -2
@@ -4,32 +4,9 @@
  #
 
 ################################################################################
  -SLANG_VERSION = 1.4.5
-SLANG_SOURCE = slang-$(SLANG_VERSION)-mini.tar.bz2
-SLANG_SITE = http://www.uclibc.org/
+SLANG_VERSION = 2.2.4
+SLANG_SITE = ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.2/

My suggestion is:

Quoted 5 lines

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)/

O.K. I'll rework the patch, though I'm not sure, that this library will be updated very soon. The latest version was released in 2011.

Quoted 37 lines
Quoted 35 lines
package/slang/slang.mk +1 -8
  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

package/slang/slang.mk +0 -5
-       (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

package/slang/slang.mk +1 -4
-       (cd $(TARGET_DIR)/usr/lib; ln -fs libslang.so libslang.so.1)
-endef
-
-$(eval $(generic-package))
+$(eval $(autotools-package))