1From 734ab2f7879c6f94fc18ea6a10adb9bd156ba769 Mon Sep 17 00:00:00 2001
2From: Venture Research <tech@ventureresearch.com>
3Date: Fri, 8 Feb 2013 20:22:19 -0600
4Subject: [PATCH] lua: update Makefile to use environment build settings
5
6OE-specific parameters, instead of overriding all of these simply use
7the ones that are already passed in. Also configure for only Linux...
8
9Signed-off-by: Venture Research <tech@ventureresearch.com>
10
11Updated to work with 3.0.x
12
13Signed-off-by: Armin Kuster <akust808@gmail.com>
14
15updated to work wtih 6.2.1
16Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
17
18---
19 deps/Makefile         |  1 -
20 deps/lua/Makefile     |  1 -
21 deps/lua/src/Makefile | 16 ++++++----------
22 3 files changed, 6 insertions(+), 12 deletions(-)
23
24diff --git a/deps/Makefile b/deps/Makefile
25index 8592e17..1807af5 100644
26--- a/deps/Makefile
27+++ b/deps/Makefile
28@@ -81,7 +81,6 @@ endif
29 # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
30 # challenging to cross-compile lua (and redis).  These defines make it easier
31 # to fit redis into cross-compilation environments, which typically set AR.
32-AR=ar
33 ARFLAGS=rc
34
35 lua: .make-prerequisites
36diff --git a/deps/lua/Makefile b/deps/lua/Makefile
37index 209a132..72f4b2b 100644
38--- a/deps/lua/Makefile
39+++ b/deps/lua/Makefile
40@@ -33,7 +33,6 @@ INSTALL_DATA= $(INSTALL) -m 0644
41
42 # Utilities.
43 MKDIR= mkdir -p
44-RANLIB= ranlib
45
46 # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
47
48diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile
49index f3bba2f..1555ec0 100644
50--- a/deps/lua/src/Makefile
51+++ b/deps/lua/src/Makefile
52@@ -5,18 +5,14 @@
53 # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
54
55 # Your platform. See PLATS for possible values.
56-PLAT= none
57+PLAT= linux
58
59-CC?= gcc
60-CFLAGS= -O2 -Wall $(MYCFLAGS)
61-AR= ar rcu
62-RANLIB= ranlib
63-RM= rm -f
64-LIBS= -lm $(MYLIBS)
65-
66-MYCFLAGS=
67+MYCFLAGS=-DLUA_USE_LINUX
68 MYLDFLAGS=
69-MYLIBS=
70+MYLIBS=-Wl,-E -ldl -lreadline -lhistory -lncurses
71+
72+CFLAGS += $(MYCFLAGS)
73+LIBS += -lm $(MYLIBS)
74
75 # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
76
77