Revision: 2848
http://ipcop.svn.sourceforge.net/ipcop/?rev=2848&view=rev
Author: owes
Date: 2009-05-13 10:59:07 +0000 (Wed, 13 May 2009)
Log Message:
-----------
Upgrade readline to 6.0
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/readline
ipcop/trunk/lfs/readline
Modified: ipcop/trunk/config/rootfiles/common/readline
===================================================================
--- ipcop/trunk/config/rootfiles/common/readline 2009-05-13 10:52:47 UTC
(rev 2847)
+++ ipcop/trunk/config/rootfiles/common/readline 2009-05-13 10:59:07 UTC
(rev 2848)
@@ -1,23 +1,36 @@
-## readline-5.2
+## readline-6.0
##
-#usr/include/readline/readline.h
+lib/libhistory.so.6
+lib/libhistory.so.6.0
+lib/libreadline.so.6
+lib/libreadline.so.6.0
+#usr/include/readline
#usr/include/readline/chardefs.h
+#usr/include/readline/history.h
#usr/include/readline/keymaps.h
-#usr/include/readline/history.h
-#usr/include/readline/tilde.h
+#usr/include/readline/readline.h
+#usr/include/readline/rlconf.h
#usr/include/readline/rlstdc.h
-#usr/include/readline/rlconf.h
#usr/include/readline/rltypedefs.h
-#usr/info/readline.info
-#usr/info/rluserman.info
-#usr/info/history.info
-#usr/man/man3/readline.3
-#usr/man/man3/history.3
+#usr/include/readline/tilde.h
+#usr/lib/libhistory.a
+usr/lib/libhistory.so
#usr/lib/libreadline.a
-#usr/lib/libhistory.a
usr/lib/libreadline.so
-usr/lib/libhistory.so
-lib/libhistory.so.5.2
-lib/libhistory.so.5
-lib/libreadline.so.5.2
-lib/libreadline.so.5
+#usr/share/info/history.info
+#usr/share/info/readline.info
+#usr/share/info/rluserman.info
+#usr/share/man/man3/history.3
+#usr/share/man/man3/readline.3
+#usr/share/readline
+#usr/share/readline/excallback.c
+#usr/share/readline/fileman.c
+#usr/share/readline/histexamp.c
+#usr/share/readline/manexamp.c
+#usr/share/readline/rl-fgets.c
+#usr/share/readline/rl.c
+#usr/share/readline/rlcat.c
+#usr/share/readline/rlevent.c
+#usr/share/readline/rlptytest.c
+#usr/share/readline/rltest.c
+#usr/share/readline/rlversion.c
Modified: ipcop/trunk/lfs/readline
===================================================================
--- ipcop/trunk/lfs/readline 2009-05-13 10:52:47 UTC (rev 2847)
+++ ipcop/trunk/lfs/readline 2009-05-13 10:59:07 UTC (rev 2848)
@@ -33,19 +33,20 @@
include Config
PKG_NAME = readline
-VER = 5.2
+VER = 6.0
HOST_ARCH = all
OTHER_SRC = yes
-THISAPP = readline-$(VER)
+THISAPP = $(PKG_NAME)-$(VER)
DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_GNU)/readline
+DL_FROM = $(URL_GNU)/$(PKG_NAME)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
CFLAGS =
CXXFLAGS =
-PATCH1 = $(THISAPP)-fixes-6.patch
+# There are no LFS patches (yet)
+#PATCH1 = $(THISAPP)-fixes-6.patch
###############################################################################
# Top-level Rules
@@ -55,10 +56,10 @@
$(PATCH1)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
+#$(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
-$(DL_FILE)_MD5 = e39331f32ad14009b9ff49cc10c5e751
-$(PATCH1)_MD5 = 1e9a0f1141b62a5f8989874270c03cc8
+$(DL_FILE)_MD5 = b7f65a48add447693be6e86f04a63019
+#$(PATCH1)_MD5 = 1e9a0f1141b62a5f8989874270c03cc8
install : $(TARGET)
@@ -91,16 +92,18 @@
cd $(DIR_APP) && sed -i '/MV.*old/d' Makefile.in
cd $(DIR_APP) && sed -i '/{OLDSUFF}/c:' support/shlib-install
- cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(PATCH1)
- cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/readline-5.0-parallel.patch
+ # There are no LFS patches (yet)
+ #cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(PATCH1)
+ # Parallel build works for me at the moment, may need to rebase this
patch if it fails again
+ #cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/readline-5.0-parallel.patch
cd $(DIR_APP) && ./configure --prefix=/usr \
--libdir=/lib
cd $(DIR_APP) && make -j $(PARALLELISM) SHLIB_LIBS=-lncurses
cd $(DIR_APP) && make install
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
+ ln -sfv ../../lib/libreadline.so.6 /usr/lib/libreadline.so
+ ln -sfv ../../lib/libhistory.so.6 /usr/lib/libhistory.so
@rm -rf $(DIR_APP)
@$(POSTBUILD)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
