summaryrefslogtreecommitdiffstats
path: root/package/lua/patches/100-no_readline.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-05-22 14:20:36 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-05-22 14:20:36 +0000
commitbdba5787663bee20325cabd76ed4661ee8c8dd96 (patch)
tree5d87b795c130a543db9101ba74c12d9068dd2d99 /package/lua/patches/100-no_readline.patch
parentd2ec372844004b8a21a7ea2fd0207f1ec48bef57 (diff)
add updated lua patchset from Steven Barth (cyrus) as explained in http://lists.openwrt.org/pipermail/openwrt-devel/2008-May/002170.html
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11239 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/lua/patches/100-no_readline.patch')
-rw-r--r--package/lua/patches/100-no_readline.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/package/lua/patches/100-no_readline.patch b/package/lua/patches/100-no_readline.patch
index 7969a2974..7368187d8 100644
--- a/package/lua/patches/100-no_readline.patch
+++ b/package/lua/patches/100-no_readline.patch
@@ -1,8 +1,7 @@
-Index: lua-5.1.3/src/luaconf.h
-===================================================================
---- lua-5.1.3.orig/src/luaconf.h 2008-04-13 16:18:00.338123105 +0200
-+++ lua-5.1.3/src/luaconf.h 2008-04-13 16:18:14.110907972 +0200
-@@ -36,7 +36,6 @@
+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 */
@@ -10,10 +9,10 @@ Index: lua-5.1.3/src/luaconf.h
#endif
#if defined(LUA_USE_MACOSX)
-Index: lua-5.1.3/src/Makefile
-===================================================================
---- lua-5.1.3.orig/src/Makefile 2008-04-13 16:18:18.695169214 +0200
-+++ lua-5.1.3/src/Makefile 2008-04-13 16:24:41.036957630 +0200
+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=
@@ -22,7 +21,7 @@ Index: lua-5.1.3/src/Makefile
# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
-@@ -83,7 +84,7 @@
+@@ -86,7 +87,7 @@
@echo "MYLIBS = $(MYLIBS)"
# convenience targets for popular platforms
@@ -31,7 +30,7 @@ Index: lua-5.1.3/src/Makefile
none:
@echo "Please choose a platform:"
@echo " $(PLATS)"
-@@ -98,16 +99,16 @@
+@@ -101,16 +102,16 @@
$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
freebsd:
@@ -51,3 +50,4 @@ Index: lua-5.1.3/src/Makefile
# 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.