Commit 4db7858c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by Rémi Denis-Courmont

LUA contrib: discard Linux readline support (not needed)

parent 1a281863
...@@ -656,6 +656,7 @@ ifdef HAVE_WIN32 ...@@ -656,6 +656,7 @@ ifdef HAVE_WIN32
(cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM); cd src; $(HOSTCC) make liblua.a; cd ..;$(HOSTCC) make install INSTALL_TOP=$(PREFIX); $(RANLIB) $(PREFIX)/lib/liblua.a) (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM); cd src; $(HOSTCC) make liblua.a; cd ..;$(HOSTCC) make install INSTALL_TOP=$(PREFIX); $(RANLIB) $(PREFIX)/lib/liblua.a)
(cd $<; sed -i.orig 's@prefix= /usr/local@prefix= $(PREFIX)@' etc/lua.pc; mkdir -p $(PREFIX)/lib/pkgconfig; cp etc/lua.pc $(PREFIX)/lib/pkgconfig) (cd $<; sed -i.orig 's@prefix= /usr/local@prefix= $(PREFIX)@' etc/lua.pc; mkdir -p $(PREFIX)/lib/pkgconfig; cp etc/lua.pc $(PREFIX)/lib/pkgconfig)
else else
(cd $<; patch -p1) < Patches/lua-noreadline.patch
(cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX)) (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX))
endif endif
touch $@ touch $@
......
LUA: do not use readline on Linux
diff -ru lua-5.1/src/Makefile lua/src/Makefile
--- lua-5.1/src/Makefile 2006-02-16 17:45:09.000000000 +0200
+++ lua/src/Makefile 2009-02-09 23:35:21.000000000 +0200
@@ -92,7 +92,7 @@
$(MAKE) all MYCFLAGS=
linux:
- $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
+ $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl"
macosx:
$(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
diff -ru lua-5.1/src/luaconf.h lua/src/luaconf.h
--- lua-5.1/src/luaconf.h 2006-02-10 19:44:06.000000000 +0200
+++ lua/src/luaconf.h 2009-02-09 23:33:29.000000000 +0200
@@ -36,7 +36,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)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment