X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Freadline;h=eb488e3363af3798335470e5dc0bdb97b3e7d31f;hb=88b1e637ac581b836bcdfa4a44deeef2d8ff9711;hp=e2d6248fab6702d8a0389e0c20256761089dc42d;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be;p=ipfire-2.x.git

diff --git a/lfs/readline b/lfs/readline
index e2d6248fab..eb488e3363 100644
--- a/lfs/readline
+++ b/lfs/readline
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.1
+VER        = 6.3
 
 THISAPP    = readline-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7ee5a692db88b30ca48927a13fd60e46
+$(DL_FILE)_MD5 = 33c8fb279e981274f485fd91da77e94a
 
 install : $(TARGET)
 
@@ -70,16 +70,15 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/readline-5.1-fixes-3.patch
-	cd $(DIR_APP) && sed -i '/MV.*old/d' Makefile.in
-	cd $(DIR_APP) && sed -i '/{OLDSUFF}/c:' support/shlib-install
-	cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib
+
+	for i in $$(seq 1 6); do \
+		cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline63-$$(printf "%03d" "$${i}") || exit 1; \
+	done
+
+	cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
 	cd $(DIR_APP) && make $(MAKETUNING) SHLIB_LIBS=-lncurses
 	cd $(DIR_APP) && make install
-	chmod -v 755 /lib/lib{readline,history}.so*
-	mv -v /lib/lib{readline,history}.a /usr/lib
-	rm -v /lib/lib{readline,history}.so
-	ln -sfv ../../lib/libreadline.so.5 /usr/lib/libreadline.so
-	ln -sfv ../../lib/libhistory.so.5 /usr/lib/libhistory.so
+
+	rm -rfv /usr/share/readline
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)