2
1

redis-002-lua-AR.patch 1.1 KB

1234567891011121314151617181920212223242526272829303132
  1. redis-002-lua-AR.patch: Improve redis Makefiles to handle Lua's unusual
  2. definition of AR. Patch originates from:
  3. Define AR to help with lua cross-compilation
  4. https://github.com/antirez/redis/pull/997
  5. Daniel Price, daniel.price@gmail.com
  6. Signed-off-by: Daniel Price <daniel.price@gmail.com>
  7. =========================================================================
  8. diff --git a/deps/Makefile b/deps/Makefile
  9. index d58ee56..c9d7116 100644
  10. --- a/deps/Makefile
  11. +++ b/deps/Makefile
  12. @@ -60,10 +60,15 @@ endif
  13. LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS)
  14. LUA_LDFLAGS+= $(LDFLAGS)
  15. +# lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
  16. +# challenging to cross-compile lua (and redis). These defines make it easier
  17. +# to fit redis into cross-compilation environments, which typically set AR.
  18. +AR = ar
  19. +ARFLAGS = rcu
  20. lua: .make-prerequisites
  21. @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
  22. - cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)"
  23. + cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
  24. .PHONY: lua