diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-09-10 20:40:10 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-10-05 07:45:32 -0700 |
commit | b3a244153414fa627b247dd29f95197fdaae69e1 (patch) | |
tree | b2bcbd15ceb0eb21785993cb003a09f0b3c283dc /meta-oe/recipes-extended/redis/redis_4.0.14.bb | |
parent | 6a98afe854907a6263ab5f08ccbc155943470c59 (diff) | |
download | meta-openembedded-b3a244153414fa627b247dd29f95197fdaae69e1.tar.gz |
redis: Fix build with clang/x86
Need to link with libatomics for 64bit atomics support
Fixes
i686-yoe-linux/i686-yoe-linux-ld: networking.o: in function `createClient':
| /usr/src/debug/redis/4.0.14-r0/redis-4.0.14/src/networking.c:103: undefined reference to `__atomic_fetch_add_8'
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 2b49254d61ca817799a206cd022617854aa5bc0b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/redis/redis_4.0.14.bb')
-rw-r--r-- | meta-oe/recipes-extended/redis/redis_4.0.14.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/redis/redis_4.0.14.bb b/meta-oe/recipes-extended/redis/redis_4.0.14.bb index 5df5312a0f..45ea29b702 100644 --- a/meta-oe/recipes-extended/redis/redis_4.0.14.bb +++ b/meta-oe/recipes-extended/redis/redis_4.0.14.bb @@ -11,6 +11,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://lua-update-Makefile-to-use-environment-build-setting.patch \ file://oe-use-libc-malloc.patch \ file://Fixed-stack-trace-generation-on-aarch64.patch \ + file://0001-src-Do-not-reset-FINAL_LIBS.patch \ file://redis.conf \ file://init-redis-server \ file://redis.service \ @@ -25,11 +26,13 @@ SRC_URI[sha256sum] = "1e1e18420a86cfb285933123b04a82e1ebda20bfb0a289472745a08758 inherit autotools-brokensep update-rc.d systemd useradd +FINAL_LIBS_x86_toolchain-clang = "-latomic" +export FINAL_LIBS + USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" GROUPADD_PARAM_${PN} = "--system redis" - REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" do_compile_prepend() { |