NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/efl: eina: set EINA_VALUE_EMPTY during library init

Browse Source 
Fix a build issue introduced with efl 1.22.2.

See https://phab.enlightenment.org/D9348.

Fixes:
http://autobuild.buildroot.net/results/fa8/fa80b558d2df9e02e2997d57ac0e3be63881c5c4

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Tested-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Romain Naour 2019-07-18 23:36:20 +02:00 committed by Thomas Petazzoni
parent 0ed6e57a8d
commit 2b79e7c96e
1 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
package/efl/0002-eina-set-EINA_VALUE_EMPTY-during-library-init.patch Normal file
View File

@ -0,0 +1,51 @@
From b8458ed248cf49bfe9a263d708b5e34adf77e275 Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@free.fr>
Date: Wed, 17 Jul 2019 11:12:18 -0700
Subject: [PATCH] eina: set EINA_VALUE_EMPTY during library init.
This is a work around compiler/linker limit on some system as reported
by Romain Naour.
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Differential Revision: https://phab.enlightenment.org/D9348
(cherry picked from commit c46a8143916f0d3f66bbdffc7107c97c88df212d)
[Romain: backport to 1.22.x]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
src/lib/eina/eina_value.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/lib/eina/eina_value.c b/src/lib/eina/eina_value.c
index c75a5f1235..942a6d533e 100644
--- a/src/lib/eina/eina_value.c
+++ b/src/lib/eina/eina_value.c
@@ -58,7 +58,7 @@ static Eina_Hash *_eina_value_inner_mps = NULL;
static Eina_Lock _eina_value_inner_mps_lock;
static char *_eina_value_mp_choice = NULL;
static int _eina_value_log_dom = -1;
-static const Eina_Value _eina_value_empty = EINA_VALUE_EMPTY;
+static Eina_Value _eina_value_empty;
#ifdef ERR
#undef ERR
@@ -5404,6 +5404,7 @@ eina_value_inner_free(size_t size, void *mem)
Eina_Bool
eina_value_init(void)
{
+ const Eina_Value empty = EINA_VALUE_EMPTY;
const char *choice, *tmp;
_eina_value_log_dom = eina_log_domain_register("eina_value",
@@ -5490,6 +5491,8 @@ eina_value_init(void)
EINA_ERROR_VALUE_FAILED = eina_error_msg_static_register("Eina_Value failed to copy/convert.");
+ memcpy(&_eina_value_empty, &empty, sizeof (empty));
+
return EINA_TRUE;
on_init_fail_hash:
--
2.21.0