* [PATCH] redis: fix hiredis build so it's less failure-prone and links properly
@ 2016-06-08 0:14 Stephen Arnold
2016-06-22 16:56 ` Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Arnold @ 2016-06-08 0:14 UTC (permalink / raw)
To: openembedded-devel; +Cc: Stephen Arnold
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>
---
...-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
+ 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] redis: fix hiredis build so it's less failure-prone and links properly
2016-06-08 0:14 [PATCH] redis: fix hiredis build so it's less failure-prone and links properly Stephen Arnold
@ 2016-06-22 16:56 ` Khem Raj
2016-06-23 2:02 ` Stephen Arnold
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2016-06-22 16:56 UTC (permalink / raw)
To: openembedded-devel; +Cc: Stephen Arnold
[-- Attachment #1: Type: text/plain, Size: 2667 bytes --]
> On Jun 7, 2016, at 5:14 PM, Stephen Arnold <sarnold@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@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@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] redis: fix hiredis build so it's less failure-prone and links properly
2016-06-22 16:56 ` Khem Raj
@ 2016-06-23 2:02 ` Stephen Arnold
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Arnold @ 2016-06-23 2:02 UTC (permalink / raw)
To: openembeded-devel
True,, but it still needs the ranlib hunk; do I really need to redo
it, or can we take it as-is?
Steve
On Wed, Jun 22, 2016 at 9:56 AM, Khem Raj <raj.khem@gmail.com> wrote:
>
>> On Jun 7, 2016, at 5:14 PM, Stephen Arnold <sarnold@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@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@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-23 2:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-08 0:14 [PATCH] redis: fix hiredis build so it's less failure-prone and links properly Stephen Arnold
2016-06-22 16:56 ` Khem Raj
2016-06-23 2:02 ` Stephen Arnold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.