summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/readline/readline-4.3/shlink-termcap.patch45
-rw-r--r--meta/packages/readline/readline-5.2/acinclude.m4 (renamed from meta/packages/readline/readline-4.3/acinclude.m4)0
-rw-r--r--meta/packages/readline/readline_5.2.bb (renamed from meta/packages/readline/readline_4.3.bb)4
3 files changed, 2 insertions, 47 deletions
diff --git a/meta/packages/readline/readline-4.3/shlink-termcap.patch b/meta/packages/readline/readline-4.3/shlink-termcap.patch
deleted file mode 100644
index 249f4e7081..0000000000
--- a/meta/packages/readline/readline-4.3/shlink-termcap.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- readline-4.3/shlib/Makefile.in~shlink-termcap
7+++ readline-4.3/shlib/Makefile.in
8@@ -53,11 +53,13 @@
9 CFLAGS = @CFLAGS@
10 LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
11 CPPFLAGS = @CPPFLAGS@
12-LDFLAGS = @LDFLAGS@ @LOCAL_LDFLAGS@ @CFLAGS@
13+LDFLAGS = @LDFLAGS@ $(SHOBJ_LDFLAGS) $(SHLIB_XLDFLAGS) @LOCAL_LDFLAGS@ @CFLAGS@
14
15 DEFS = @DEFS@
16 LOCAL_DEFS = @LOCAL_DEFS@
17
18+TERMCAP_LIB = @TERMCAP_LIB@
19+
20 #
21 # These values are generated for configure by ${topdir}/support/shobj-conf.
22 # If your system is not supported by that script, but includes facilities for
23@@ -73,7 +75,7 @@
24 SHOBJ_LIBS = @SHOBJ_LIBS@
25
26 SHLIB_XLDFLAGS = @SHLIB_XLDFLAGS@
27-SHLIB_LIBS = @SHLIB_LIBS@
28+SHLIB_LIBS = @SHLIB_LIBS@ @TERMCAP_LIB@
29 SHLIB_LIBSUFF = @SHLIB_LIBSUFF@
30
31 SHLIB_LIBVERSION = @SHLIB_LIBVERSION@
32@@ -147,11 +149,11 @@
33
34 $(SHARED_READLINE): $(SHARED_OBJ)
35 $(RM) $@
36- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS)
37+ $(SHOBJ_LD) ${LDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS)
38
39 $(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so
40 $(RM) $@
41- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS)
42+ $(SHOBJ_LD) ${LDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS)
43
44 # Since tilde.c is shared between readline and bash, make sure we compile
45 # it with the right flags when it's built as part of readline
diff --git a/meta/packages/readline/readline-4.3/acinclude.m4 b/meta/packages/readline/readline-5.2/acinclude.m4
index 8a45f99084..8a45f99084 100644
--- a/meta/packages/readline/readline-4.3/acinclude.m4
+++ b/meta/packages/readline/readline-5.2/acinclude.m4
diff --git a/meta/packages/readline/readline_4.3.bb b/meta/packages/readline/readline_5.2.bb
index 6dfce726fe..1780ee172f 100644
--- a/meta/packages/readline/readline_4.3.bb
+++ b/meta/packages/readline/readline_5.2.bb
@@ -10,9 +10,9 @@ RPROVIDES_${PN} += "readline"
10LEAD_SONAME = "libreadline.so" 10LEAD_SONAME = "libreadline.so"
11PR = "r3" 11PR = "r3"
12 12
13SRC_URI = "ftp://ftp.cwru.edu/pub/bash/readline-${PV}.tar.gz \ 13SRC_URI = "ftp://ftp.gnu.org/gnu/readline/readline-${PV}.tar.gz \
14 file://shlink-termcap.patch;patch=1 \
15 file://acinclude.m4" 14 file://acinclude.m4"
15
16S = "${WORKDIR}/readline-${PV}" 16S = "${WORKDIR}/readline-${PV}"
17 17
18inherit autotools 18inherit autotools