diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-02-22 18:10:23 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-02-22 18:10:23 +0000 |
| commit | 661b44661104a78eb758da7d197ba187eb60d436 (patch) | |
| tree | 91b892df861afeed191347896d3130d59d41410f /tools/lua/patches/100-no_readline.patch | |
| parent | 506037412e56152354ec6e804b25b97b0db4ca34 (diff) | |
| download | upstream-661b44661104a78eb758da7d197ba187eb60d436.tar.gz upstream-661b44661104a78eb758da7d197ba187eb60d436.tar.bz2 upstream-661b44661104a78eb758da7d197ba187eb60d436.zip | |
merge host build of lua from tools/ into package/lua/Makefile
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14622 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/lua/patches/100-no_readline.patch')
| -rw-r--r-- | tools/lua/patches/100-no_readline.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/tools/lua/patches/100-no_readline.patch b/tools/lua/patches/100-no_readline.patch deleted file mode 100644 index 0350e470ad..0000000000 --- a/tools/lua/patches/100-no_readline.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -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) ---- a/src/Makefile -+++ b/src/Makefile -@@ -17,6 +17,7 @@ LIBS= -lm $(MYLIBS) - MYCFLAGS= - MYLDFLAGS= - MYLIBS= -+# USE_READLINE=1 - - # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= - -@@ -86,7 +87,7 @@ echo: - @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 @@ bsd: - $(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 - |