diff options
| author | Daniel Price <daniel.price@gmail.com> | 2013-03-11 15:47:11 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-03-18 22:42:02 +0100 |
| commit | 80a902c407462dbd2d239ded97c2cdf66fae4a51 (patch) | |
| tree | 868194db477000a6f030b8aa8d3c660aa1a90006 /package/redis/redis-002-lua-AR.patch | |
| parent | 96879b87a90d8c1e4de3c399a9e8df6dc4537180 (diff) | |
| download | buildroot-novena-80a902c407462dbd2d239ded97c2cdf66fae4a51.tar.gz buildroot-novena-80a902c407462dbd2d239ded97c2cdf66fae4a51.zip | |
new package: redis
[Peter: fix white space, drop _SOURCE]
Signed-off-by: Daniel Price <daniel.price@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/redis/redis-002-lua-AR.patch')
| -rw-r--r-- | package/redis/redis-002-lua-AR.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/redis/redis-002-lua-AR.patch b/package/redis/redis-002-lua-AR.patch new file mode 100644 index 000000000..68ee70c56 --- /dev/null +++ b/package/redis/redis-002-lua-AR.patch @@ -0,0 +1,32 @@ + +redis-002-lua-AR.patch: Improve redis Makefiles to handle Lua's unusual +definition of AR. Patch originates from: + + Define AR to help with lua cross-compilation + https://github.com/antirez/redis/pull/997 + Daniel Price, daniel.price@gmail.com + +Signed-off-by: Daniel Price <daniel.price@gmail.com> + +========================================================================= +diff --git a/deps/Makefile b/deps/Makefile +index d58ee56..c9d7116 100644 +--- a/deps/Makefile ++++ b/deps/Makefile +@@ -60,10 +60,15 @@ endif + + LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS) + LUA_LDFLAGS+= $(LDFLAGS) ++# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more ++# challenging to cross-compile lua (and redis). These defines make it easier ++# to fit redis into cross-compilation environments, which typically set AR. ++AR = ar ++ARFLAGS = rcu + + lua: .make-prerequisites + @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) +- cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" ++ cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)" + + .PHONY: lua + |