diff options
| -rw-r--r-- | meta/packages/readline/readline-4.3/shlink-termcap.patch | 45 | ||||
| -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 249f4e708..000000000 --- a/meta/packages/readline/readline-4.3/shlink-termcap.patch +++ /dev/null @@ -1,45 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- readline-4.3/shlib/Makefile.in~shlink-termcap -+++ readline-4.3/shlib/Makefile.in -@@ -53,11 +53,13 @@ - CFLAGS = @CFLAGS@ - LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"' - CPPFLAGS = @CPPFLAGS@ --LDFLAGS = @LDFLAGS@ @LOCAL_LDFLAGS@ @CFLAGS@ -+LDFLAGS = @LDFLAGS@ $(SHOBJ_LDFLAGS) $(SHLIB_XLDFLAGS) @LOCAL_LDFLAGS@ @CFLAGS@ - - DEFS = @DEFS@ - LOCAL_DEFS = @LOCAL_DEFS@ - -+TERMCAP_LIB = @TERMCAP_LIB@ -+ - # - # These values are generated for configure by ${topdir}/support/shobj-conf. - # If your system is not supported by that script, but includes facilities for -@@ -73,7 +75,7 @@ - SHOBJ_LIBS = @SHOBJ_LIBS@ - - SHLIB_XLDFLAGS = @SHLIB_XLDFLAGS@ --SHLIB_LIBS = @SHLIB_LIBS@ -+SHLIB_LIBS = @SHLIB_LIBS@ @TERMCAP_LIB@ - SHLIB_LIBSUFF = @SHLIB_LIBSUFF@ - - SHLIB_LIBVERSION = @SHLIB_LIBVERSION@ -@@ -147,11 +149,11 @@ - - $(SHARED_READLINE): $(SHARED_OBJ) - $(RM) $@ -- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS) -+ $(SHOBJ_LD) ${LDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS) - - $(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so - $(RM) $@ -- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS) -+ $(SHOBJ_LD) ${LDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS) - - # Since tilde.c is shared between readline and bash, make sure we compile - # 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 8a45f9908..8a45f9908 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 6dfce726f..1780ee172 100644 --- a/meta/packages/readline/readline_4.3.bb +++ b/meta/packages/readline/readline_5.2.bb @@ -10,9 +10,9 @@ RPROVIDES_${PN} += "readline" LEAD_SONAME = "libreadline.so" PR = "r3" -SRC_URI = "ftp://ftp.cwru.edu/pub/bash/readline-${PV}.tar.gz \ - file://shlink-termcap.patch;patch=1 \ +SRC_URI = "ftp://ftp.gnu.org/gnu/readline/readline-${PV}.tar.gz \ file://acinclude.m4" + S = "${WORKDIR}/readline-${PV}" inherit autotools |