Skip to contentSkip to conversation

redis: Fix build with clang/x86

PATCH New Khem Raj 1 participant 3 messages Sep 11, 2019

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 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'

---
 .../0001-src-Do-not-reset-FINAL_LIBS.patch    | 32 +++++++++++++++++++
 .../recipes-extended/redis/redis_4.0.14.bb    |  5 ++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch
meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch new file +32 -0
new file mode 100644
index 0000000000..04af15dd86
@@ -0,0 +1,32 @@
+From 97584e1eb78dc18599534b47b6670c20c63f5ee2 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Tue, 10 Sep 2019 20:04:26 -0700
+Subject: [PATCH] src: Do not reset FINAL_LIBS
+
+This helps case where additional libraries are needed to be passed from
+environment to get it going
+
+e.g. -latomic is needed on clang/x86 to provide for 64bit atomics
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 7f7c625..c71dd3b 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -66,7 +66,7 @@ endif
+ 
+ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+ FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
+-FINAL_LIBS=-lm
++FINAL_LIBS+=-lm
+ DEBUG=-g -ggdb
+ 
+ ifeq ($(uname_S),SunOS)
+-- 
+2.23.0
+
meta-oe/recipes-extended/redis/redis_4.0.14.bb +4 -1
index 5df5312a0f..45ea29b702 100644
@@ -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() {
Signature · 1 line
2.23.0
author
#1 lore raw

PATCH 2/3 android-tools: Recognise i686 for HOST_ARCH

qemux86 now uses i686

---
 .../recipes-devtools/android-tools/android-tools_5.1.1.r37.bb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +1 -1
index 34b0b7a3b6..c0d08db174 100644
@@ -102,7 +102,7 @@ do_compile() {
       powerpc|powerpc64)
         export android_arch=linux-ppc
       ;;
-      i586|x86_64)
+      i586|i686|x86_64)
         export android_arch=linux-x86
       ;;
     esac
Signature · 1 line
2.23.0
author
#2 lore raw

PATCH 3/3 netdata: Update to 1.17.0 and fix build with clang/x86

In reply to Khem Raj
---
 meta-webserver/recipes-webadmin/netdata/netdata_git.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
meta-webserver/recipes-webadmin/netdata/netdata_git.bb +5 -2
index 811c2c5223..d179e84e33 100644
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24"
 SRC_URI = "git://github.com/firehol/netdata.git;protocol=https \
            file://0002-Makefiles-does-not-build-contrib-dir.patch \
 "
-SRCREV = "2c4146832061635273d153a5174c85fb1d967d57"
-PV = "1.16.0+git${SRCPV}"
+SRCREV = "588ce5a7b18999dfa66698cd3a2f005f7a3c31cf"
+PV = "1.17.0"
 
 # patch to disable timeout because timeout are not available with actual version
 # of core-utils
@@ -25,6 +25,9 @@ DEPENDS += "zlib util-linux"
 
 inherit pkgconfig autotools-brokensep useradd systemd
 
+LIBS_toolchain-clang_x86 = "-latomic"
+export LIBS
+
 #systemd
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE_${PN} = "netdata.service"
Signature · 1 line
2.23.0