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

[Khem Raj]

> On Jun 7, 2016, at 5:14 PM, Stephen Arnold <sarnold at vctlabs.com> wrote:
> 
> 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 at vctlabs.com>
> ---
> ...-update-Makefile-to-add-symbols-to-staticlib.patch | 19 +++++++++++++++++++
> meta-oe/recipes-extended/redis/redis_3.0.2.bb         |  2 ++
> 2 files changed, 21 insertions(+)
> create mode 100644 meta-oe/recipes-extended/redis/redis/hiredis-update-Makefile-to-add-symbols-to-staticlib.patch
> 
> diff --git a/meta-oe/recipes-extended/redis/redis/hiredis-update-Makefile-to-add-symbols-to-staticlib.patch b/meta-oe/recipes-extended/redis/redis/hiredis-update-Makefile-to-add-symbols-to-staticlib.patch
> new file mode 100644
> index 0000000..2b3b587
> --- /dev/null
> +++ b/meta-oe/recipes-extended/redis/redis/hiredis-update-Makefile-to-add-symbols-to-staticlib.patch
> @@ -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

You can pass is via EXTRA_OEMAKE from recipe. No need to patch the Makefile.

> + 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)
> diff --git a/meta-oe/recipes-extended/redis/redis_3.0.2.bb b/meta-oe/recipes-extended/redis/redis_3.0.2.bb
> index 55f2c96..2e4b760 100644
> --- a/meta-oe/recipes-extended/redis/redis_3.0.2.bb
> +++ b/meta-oe/recipes-extended/redis/redis_3.0.2.bb
> @@ -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"
> 
> --
> 2.8.1
> 
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 204 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20160622/48d654d3/attachment-0002.sig>