Commit d2265001 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

redis: bump to version 2.8.19 



Add hash file.
Drop redis-002-lua-AR.patch (upstream).
Rename patches to new naming convention.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 9a4d760e

package/redis/Config.in

+4 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config BR2_PACKAGE_REDIS 
	depends on BR2_USE_MMU # fork()

	depends on BR2_TOOLCHAIN_HAS_THREADS

	depends on BR2_LARGEFILE

	depends on BR2_INET_IPV6

	help

	  Redis is an open source, advanced key-value store. It is

	  often referred to as a data structure server since keys can
@@ -10,6 +11,7 @@ config BR2_PACKAGE_REDIS 


	  http://www.redis.io



comment "redis needs a toolchain w/ largefile, threads"

comment "redis needs a toolchain w/ IPv6, largefile, threads"

	depends on BR2_USE_MMU

	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
 
	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS \

		|| !BR2_INET_IPV6

package/redis/redis-002-lua-AR.patch

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 


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

package/redis/redis.hash

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# Locally calculated

sha256	29bb08abfc3d392b2f0c3e7f48ec46dd09ab1023f9a5575fc2a93546f4ca5145	redis-2.8.19.tar.gz