[Gsrc-commit] trunk r4110: readline 7 patch 1

[Carl Hansen]

------------------------------------------------------------
revno: 4110
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Wed 2016-11-16 18:46:20 -0800
message:
  readline 7 patch 1
added:
  pkg/gnu/readline/files/readline-7.0-link-ncurses.diff 
readline7.0linkncurs-20161117024515-ok2bs63w9a5dq34l-1
modified:
  pkg/gnu/readline/Makefile      makefile-20160617014725-uokjfnggs70iry9h-1635
  pkg/gnu/readline/sha256sums    sha256sums-20160617014725-uokjfnggs70iry9h-1643

=== modified file 'pkg/gnu/readline/Makefile'
--- a/pkg/gnu/readline/Makefile 2016-09-16 04:04:29 +0000
+++ b/pkg/gnu/readline/Makefile 2016-11-17 02:46:20 +0000
@@ -18,6 +18,7 @@
 NAME = Readline
 GARNAME = readline
 GARVERSION = 7.0
+PATCHNUM = 1
 HOME_URL = http://www.gnu.org/software/readline/
 DESCRIPTION = Edit command lines while typing, with history support
 define BLURB
@@ -32,21 +33,20 @@
 
 MASTER_SITES = $(MASTER_GNU)
 MASTER_SUBDIR = $(GARNAME)/
-#PATCHFILE_SITES = $(MASTER_GNU)
-#PATCHFILE_SUBDIR = $(GARNAME)/$(DISTNAME)-patches/
+PATCHFILE_SITES = $(MASTER_GNU)
+PATCHFILE_SUBDIR = $(GARNAME)/$(DISTNAME)-patches/
 SIGFILE_SITES = $(MASTER_GNU)
-#SIGFILE_SUBDIR = $(PATCHFILE_SUBDIR)
+SIGFILE_SUBDIR = $(PATCHFILE_SUBDIR)
 DISTFILES = $(DISTNAME).tar.gz
-#ifneq ($(PATCHNUM),)
-#      patchnums = $(shell seq -w 001 $(PATCHNUM))
-#      upstream_patches = $(foreach num, $(patchnums), \
-#                      $(GARNAME)$(subst .,,$(GARVERSION))-$(num))
-#      PATCHFILES = $(upstream_patches) \
-#                   $(DISTNAME)-link-ncurses.diff
-#endif
-SIGFILES = $(DISTNAME).tar.gz.sig 
-#SIGFILES = $(DISTNAME).tar.gz.sig \
-#         $(foreach patchfile, $(upstream_patches), $(patchfile).sig)
+ifneq ($(PATCHNUM),)
+       patchnums = $(shell seq -w 001 $(PATCHNUM))
+       upstream_patches = $(foreach num, $(patchnums), \
+                       $(GARNAME)$(subst .,,$(GARVERSION))-$(num))
+       PATCHFILES = $(upstream_patches) \
+                    $(DISTNAME)-link-ncurses.diff
+endif
+SIGFILES = $(DISTNAME).tar.gz.sig \
+          $(foreach patchfile, $(upstream_patches), $(patchfile).sig)
 INFO_FILES = $(GARNAME).info history.info rluserman.info
 
 BUILDDEPS =

=== added file 'pkg/gnu/readline/files/readline-7.0-link-ncurses.diff'
--- a/pkg/gnu/readline/files/readline-7.0-link-ncurses.diff     1970-01-01 
00:00:00 +0000
+++ b/pkg/gnu/readline/files/readline-7.0-link-ncurses.diff     2016-11-17 
02:46:20 +0000
@@ -0,0 +1,18 @@
+This patch is to make sure that `libncurses' is among the `NEEDED'
+dependencies of `libreadline.so' and `libhistory.so'.
+
+Failing to do that, applications linking against Readline are
+forced to explicitly link against libncurses as well; in addition,
+this trick doesn't work when using GNU ld's `--as-needed'.
+
+--- work/readline-6.2/shlib/Makefile.in        2009-01-06 18:03:22.000000000 
+0100
++++ work/readline-6.2/shlib/Makefile.in        2009-07-27 14:43:25.000000000 
+0200
+@@ -84,7 +84,7 @@ SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@
+ SHOBJ_XLDFLAGS = @SHOBJ_XLDFLAGS@
+ SHOBJ_LIBS = @SHOBJ_LIBS@
+ 
+-SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@
++SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ -lncurses
+ SHLIB_LIBS = @SHLIB_LIBS@
+ 
+ SHLIB_DOT = @SHLIB_DOT@

=== modified file 'pkg/gnu/readline/sha256sums'
--- a/pkg/gnu/readline/sha256sums       2016-09-16 04:04:29 +0000
+++ b/pkg/gnu/readline/sha256sums       2016-11-17 02:46:20 +0000
@@ -1,2 +1,5 @@
 750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334  
download/readline-7.0.tar.gz
+9ac1b3ac2ec7b1bf0709af047f2d7d2a34ccde353684e57c6b47ebca77d7a376  
download/readline70-001
+db6f5be0671ba28c65bd56320467f4fbb09de1058197f923e283512a962bc4d8  
download/readline-7.0-link-ncurses.diff
 a3c90b01db0a6ae28d47770506e9da635de1c0f567b3eb3fd9b13ff5eb711e17  
download/readline-7.0.tar.gz.sig
+d5bc780c93a5b9facb87492002ded13e3f8bf6fa310a674b332b684f00563d94  
download/readline70-001.sig