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