jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 22:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

redis: use BR2_TOOLCHAIN_HAS_LIBATOMIC

Browse Source 
It uses __atomic_fetch_add_4 so libatomic must be pulled in if
necessary. Fixes:
http://autobuild.buildroot.net/results/dfd/dfdfd77463b0ddd7016202372afcad7fb6fc9ce4/

[Peter: keep TARGET_CONFIGURE_OPTS]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Gustavo Zacarias 2016-03-28 11:11:01 -03:00 committed by Peter Korsgaard
parent 2c155336a0
commit 339048ba66
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/redis/Config.in
View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_REDIS config BR2_PACKAGE_REDIS
bool "redis" bool "redis"
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
help help
Redis is an open source, advanced key-value store. It is Redis is an open source, advanced key-value store. It is
@ -11,4 +12,5 @@ config BR2_PACKAGE_REDIS
comment "redis needs a toolchain w/ threads" comment "redis needs a toolchain w/ threads"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_THREADS

6
package/redis/redis.mk
View File

@ -13,10 +13,16 @@ define REDIS_USERS
redis -1 redis -1 * /var/lib/redis /bin/false - Redis Server redis -1 redis -1 * /var/lib/redis /bin/false - Redis Server
endef endef
# Uses __atomic_fetch_add_4
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
REDIS_LIBATOMIC = -latomic
endif
# Redis doesn't support DESTDIR (yet, see # Redis doesn't support DESTDIR (yet, see
# https://github.com/antirez/redis/pull/609). We set PREFIX # https://github.com/antirez/redis/pull/609). We set PREFIX
# instead. # instead.
REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \ REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \
LDFLAGS="$(TARGET_LDFLAGS) $(REDIS_LIBATOMIC)" \
PREFIX=$(TARGET_DIR)/usr MALLOC=libc \ PREFIX=$(TARGET_DIR)/usr MALLOC=libc \
define REDIS_BUILD_CMDS define REDIS_BUILD_CMDS