redis: fix hiredis build so it's less failure-prone and links properly

This patch resets the default OPT flags to -O2 and adds the missing
ranlib command to index the static library.

Signed-off-by: Stephen Arnold <sarnold@vctlabs.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Stephen Arnold
2016-06-07 17:14:58 -07:00
committed by Martin Jansa
parent 548effebf1
commit af6af8621e
2 changed files with 21 additions and 0 deletions

View File

@@ -0,0 +1,19 @@
--- redis-3.0.2/deps/hiredis/Makefile.orig 2016-05-06 19:36:26.179003036 -0700
+++ redis-3.0.2/deps/hiredis/Makefile 2016-05-06 19:40:15.341340736 -0700
@@ -25,7 +25,7 @@
# Fallback to gcc when $CC is not in $PATH.
CC?=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
-OPTIMIZATION?=-O3
+OPTIMIZATION?=-O2
WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
DEBUG?= -g -ggdb
REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
@@ -68,6 +68,7 @@
$(STLIBNAME): $(OBJ)
$(STLIB_MAKE_CMD) $(OBJ)
+ $(RANLIB) $@
dynamic: $(DYLIBNAME)
static: $(STLIBNAME)

View File

@@ -12,7 +12,9 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
file://oe-use-libc-malloc.patch \
file://redis.conf \
file://init-redis-server \
file://hiredis-update-Makefile-to-add-symbols-to-staticlib.patch \
"
SRC_URI[md5sum] = "87be8867447f62524b584813e5a7bd14"
SRC_URI[sha256sum] = "93e422c0d584623601f89b956045be158889ebe594478a2c24e1bf218495633f"