[Gsrc-commit] /srv/bzr/gsrc/trunk r1579: fix readline linking error

[Brandon Invergo]

------------------------------------------------------------
revno: 1579
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Fri 2013-01-11 19:49:52 +0100
message:
  fix readline linking error
added:
  gnu/readline/files/
  gnu/readline/files/readline-6.2-link-ncurses.diff
modified:
  gnu/readline/Makefile
  gnu/readline/sha256sums

=== modified file 'gnu/readline/Makefile'
--- a/gnu/readline/Makefile     2012-12-18 21:05:59 +0000
+++ b/gnu/readline/Makefile     2013-01-11 18:49:52 +0000
@@ -16,10 +16,12 @@
 SIGFILE_SUBDIR = $(PATCHFILE_SUBDIR)
 DISTFILES = $(DISTNAME).tar.gz
 patchnums = $(shell seq -w 001 $(PATCHNUM))
-PATCHFILES = $(foreach num, $(patchnums), \
+upstream_patches = $(foreach num, $(patchnums), \
                $(GARNAME)$(subst .,,$(GARVERSION))-$(num))
+PATCHFILES = $(upstream_patches) \
+             $(DISTNAME)-link-ncurses.diff
 SIGFILES = $(DISTNAME).tar.gz.sig \
-          $(foreach patchfile, $(PATCHFILES), $(patchfile).sig)
+          $(foreach patchfile, $(upstream_patches), $(patchfile).sig)
 
 BUILDDEPS = 
 LIBDEPS = ncurses

=== added directory 'gnu/readline/files'
=== added file 'gnu/readline/files/readline-6.2-link-ncurses.diff'
--- a/gnu/readline/files/readline-6.2-link-ncurses.diff 1970-01-01 00:00:00 
+0000
+++ b/gnu/readline/files/readline-6.2-link-ncurses.diff 2013-01-11 18:49:52 
+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 'gnu/readline/sha256sums'
--- a/gnu/readline/sha256sums   2012-12-18 21:05:59 +0000
+++ b/gnu/readline/sha256sums   2013-01-11 18:49:52 +0000
@@ -3,6 +3,7 @@
 1e6349128cb573172063ea007c67af79256889c809973002ca66c5dfc503c7d4  
download/readline62-002
 cb2131ff352d6e5f82edc09755191f74220b15f026bdb6c52624931c79622374  
download/readline62-003
 09bd342479ea5bb8b6411bfdf7d302fab2e521d1d241bcb8344d3bad5d9f5476  
download/readline62-004
+db6f5be0671ba28c65bd56320467f4fbb09de1058197f923e283512a962bc4d8  
download/readline-6.2-link-ncurses.diff
 a18b2f67cce0c3d6ad1f8408730686d5d65c4825dd87edd9dc3200d450f864c5  
download/readline-6.2.tar.gz.sig
 1e601260b97ba3af93e74f3b1d4da56c6815bd250f8a3f52db891c96f865e472  
download/readline62-001.sig
 6069eeb149d26ede19b1906af08b3da35d048872c77500e3519a3160c73f8471  
download/readline62-002.sig