diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-01-06 11:04:49 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-01-06 11:04:49 (GMT) |
| commit | 59ee6cbe571e94478467282949c7436cd2859cb8 (patch) | |
| tree | 072b116386dd27834f7b9f8fd853c1ef2168fe0e | |
| parent | 989ea9ad3d642c2b928672ae24abd69e3b293e47 (diff) | |
| parent | d9401362c54293fc1178c64ae46d9da6936cef35 (diff) | |
| download | mxe-59ee6cbe571e94478467282949c7436cd2859cb8.zip mxe-59ee6cbe571e94478467282949c7436cd2859cb8.tar.gz mxe-59ee6cbe571e94478467282949c7436cd2859cb8.tar.bz2 | |
Merge pull request #1132 from LuaAndC/native-lua-no-readline
lua: disable readline on linux, macosx and freebsd
| -rw-r--r-- | src/lua-1-fixes.patch | 53 | ||||
| -rw-r--r-- | src/lua.mk | 1 |
2 files changed, 54 insertions, 0 deletions
diff --git a/src/lua-1-fixes.patch b/src/lua-1-fixes.patch new file mode 100644 index 0000000..e205963 --- /dev/null +++ b/src/lua-1-fixes.patch @@ -0,0 +1,53 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev <bnagaev@gmail.com> +Date: Mon, 4 Jan 2016 01:00:02 +0300 +Subject: [PATCH] disable readline on linux, macosx and freebsd + + +diff --git a/src/Makefile b/src/Makefile +index 1111111..2222222 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -102,15 +102,15 @@ c89: + + + freebsd: +- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -lreadline" ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" + + generic: $(ALL) + + linux: +- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl" + + macosx: +- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" CC=cc + + mingw: + $(MAKE) "LUA_A=lua53.dll" "LUA_T=lua.exe" \ +diff --git a/src/luaconf.h b/src/luaconf.h +index 1111111..2222222 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -61,14 +61,12 @@ + #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) + #define LUA_USE_POSIX + #define LUA_USE_DLOPEN /* MacOS does not need -ldl */ +-#define LUA_USE_READLINE /* needs an extra library: -lreadline */ + #endif + + @@ -76,6 +76,7 @@ endef define $(PKG)_BUILD_$(BUILD) $(MAKE) -C '$(1)/src' -j '$(JOBS)' \ + CC='$(BUILD_CC)' \ PLAT=$(shell ([ `uname -s` == Darwin ] && echo "macosx") || echo `uname -s` | tr '[:upper:]' '[:lower:]') $(INSTALL) '$(1)/src/lua' '$(PREFIX)/bin/$(BUILD)-lua' ln -sf '$(PREFIX)/bin/$(BUILD)-lua' '$(PREFIX)/$(BUILD)/bin/lua' |