* Updated Lua

diff --git a/INSTALL b/INSTALL
index 5e0227357ff5c5d3c32bf3991933255095607943..6cccc77f987f155234e96b817220927d4c056635 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -19,10 +19,7 @@ TOC:
        
                
 2. Kamikaze Packages
-       1.      At first make sure you already added "libreadline" from
-               the OpenWRT Packages repository to your buildroot's "package" directory
-        
-       2.      cd to the "package" directory of your kamikaze buildroot
+       1.      cd to the "package" directory of your kamikaze buildroot
        
        3.      Type: ln -s /path/to/ff-luci/contrib/package/* ./
        

diff --git a/contrib/package/lua-luci/Makefile b/contrib/package/lua-luci/Makefile
index b2188fde1b4ebd5350d9ad626bca8115856f6a92..ffa26853dfec94dda9be86a9e83d8f95727fc339 100644 (file)
--- a/contrib/package/lua-luci/Makefile
+++ b/contrib/package/lua-luci/Makefile
@@ -51,7 +51,7 @@ endef
 
 define Package/lua-luci
 $(call Package/lua-luci/Default)
-  DEPENDS:=+liblua-luci +libreadline +libncurses
+  DEPENDS:=+liblua-luci
   TITLE+= (interpreter)
 endef
 

diff --git a/contrib/package/lua-luci/patches/100-no_readline.patch b/contrib/package/lua-luci/patches/100-no_readline.patch
new file mode 100644 (file)
index 0000000..7368187
--- /dev/null
+++ b/contrib/package/lua-luci/patches/100-no_readline.patch
@@ -0,0 +1,53 @@
+diff -ur lua-luci-5.1.3/src/luaconf.h lua-luci-5.1.3-new/src/luaconf.h
+--- lua-luci-5.1.3/src/luaconf.h       2008-04-14 13:19:54.000000000 +0200
++++ lua-luci-5.1.3-new/src/luaconf.h   2008-04-14 13:19:17.000000000 +0200
+@@ -38,7 +38,6 @@
+ #if defined(LUA_USE_LINUX)
+ #define LUA_USE_POSIX
+ #define LUA_USE_DLOPEN                /* needs an extra library: -ldl */
+-#define LUA_USE_READLINE      /* needs some extra libraries */
+ #endif
+ 
+ #if defined(LUA_USE_MACOSX)
+Nur in lua-luci-5.1.3-new/src: luaconf.h.orig.
+diff -ur lua-luci-5.1.3/src/Makefile lua-luci-5.1.3-new/src/Makefile
+--- lua-luci-5.1.3/src/Makefile        2008-04-14 13:19:57.000000000 +0200
++++ lua-luci-5.1.3-new/src/Makefile    2008-04-14 13:19:17.000000000 +0200
+@@ -17,6 +17,7 @@
+ MYCFLAGS=
+ MYLDFLAGS=
+ MYLIBS=
++# USE_READLINE=1
+ 
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
+@@ -86,7 +87,7 @@
+       @echo "MYLIBS = $(MYLIBS)"
+ 
+ # convenience targets for popular platforms
+-
++RFLAG=$(if $(USE_READLINE),-DLUA_USE_READLINE)
+ none:
+       @echo "Please choose a platform:"
+       @echo "   $(PLATS)"
+@@ -101,16 +102,16 @@
+       $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
+ 
+ freebsd:
+-      $(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline"
++      $(MAKE) all MYCFLAGS="-DLUA_USE_LINUX $(RFLAG)" MYLIBS="-Wl,-E$(if $(USE_READLINE), -lreadline)"
+ 
+ generic:
+       $(MAKE) all MYCFLAGS=
+ 
+ linux:
+-      $(MAKE) all MYCFLAGS+=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
++      $(MAKE) all MYCFLAGS+="-DLUA_USE_LINUX $(RFLAG)" MYLIBS="-Wl,-E -ldl $(if $(USE_READLINE), -lreadline -lhistory -lncurses)"
+ 
+ macosx:
+-      $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
++      $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX $(if $(USE_READLINE), MYLIBS="-lreadline")
+ # use this on Mac OS X 10.3-
+ #     $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
+ 
+Nur in lua-luci-5.1.3-new/src: Makefile.orig.