From patchwork Thu Jul 18 21:36:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1133866 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nKuJ2eza"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45qSBR5HZLz9s3l for ; Fri, 19 Jul 2019 07:36:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2162185055; Thu, 18 Jul 2019 21:36:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1aBEpk1hsfJx; Thu, 18 Jul 2019 21:36:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6F3D385465; Thu, 18 Jul 2019 21:36:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 69F411BF370 for ; Thu, 18 Jul 2019 21:36:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 673BF85465 for ; Thu, 18 Jul 2019 21:36:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5m8Hxv4Ulqhv for ; Thu, 18 Jul 2019 21:36:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id CA86985055 for ; Thu, 18 Jul 2019 21:36:25 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id g17so30209344wrr.5 for ; Thu, 18 Jul 2019 14:36:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=t5mvxuK/NTuhd9A3dgYtFKhIEt78LUytkKsjOD3O5QU=; b=nKuJ2ezadNVciflmAe9KRk3QEk8BcuTJttU2Ld0lXDwVlgfueFw58YSU6gjKMHBLRy x1ZB0GhOR0UQfEvn1I+8FbO4Eio8aeHnGmVcKoOg/wFQVh+iQ+lKlBZCIhZyChDe2c/x 0Ca8do7549y+1ag+pgLSfhf0d/AytpU0slTdtmbajFcQG42xKhV3X8P1/WXyWJ3hzv3N EPcaGBWIhTH9/ZAiwY/fMJLKQoI4WYCtiCc6Xik7/6WN2jclhtmPri5GuDbnhrzkzWhA LpyV7fZa83GMXoafE+vXeALDD4XVPhLTZTJLpGNathDRKdxH+dV+nRCh61qBMmZlKjM+ G+aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=t5mvxuK/NTuhd9A3dgYtFKhIEt78LUytkKsjOD3O5QU=; b=NLMhxNo4qT73XhW/dI2CZBchy07CXzMVeUae6GqW4FiTzY1i5AXFH14UkEnaM3yxfu XRdNBEbxn7knP+kBQ2yKiG7i/vg6Q1gr2SKTKibRUrGo0a+GQR2Q0AYEjV5O7RpQKX4O 7hOIjfwFBcMZs0ddSPo7VkV2W6LuvXzRnjj9kaE/4F39wbekX9Vdo2RjWmY/qB80uwLp f3B0DO0KFwHFkgPwi+LjDN5b9U7U6FnwtKa5UFXBlu6MX7WREhoETboLD0Xhc+Px7mxr bVAUDhUVSdhT3i0ssHxPhfkMlTnDs16vG2yOy3yRvedNegDpyPVSyARceuq4APWOvFHW IKLw== X-Gm-Message-State: APjAAAUoJCFG3T4aevFqPvXTeIkwstpUtiixfy013oHufhrplQsirrVB KqwSTW+fWO3yArjkCQYkSlMBVf+g X-Google-Smtp-Source: APXvYqzUOjzxLn4HqlHa2/pOmZY7B+HPt6bhWyfDUcn7mLz9l9/a8yiNxq/TgNDUg4Z8IbI7RzXvBw== X-Received: by 2002:a5d:53ca:: with SMTP id a10mr1375742wrw.131.1563485783867; Thu, 18 Jul 2019 14:36:23 -0700 (PDT) Received: from localhost.localdomain (2a01cb0589880c00405dfcd6cc31e8fe.ipv6.abo.wanadoo.fr. [2a01:cb05:8988:c00:405d:fcd6:cc31:e8fe]) by smtp.gmail.com with ESMTPSA id c9sm24501962wml.41.2019.07.18.14.36.22 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 14:36:22 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Thu, 18 Jul 2019 23:36:20 +0200 Message-Id: <20190718213620.10591-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/efl: eina: set EINA_VALUE_EMPTY during library init X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Tested-by: Giulio Benetti --- ...EINA_VALUE_EMPTY-during-library-init.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/efl/0002-eina-set-EINA_VALUE_EMPTY-during-library-init.patch diff --git a/package/efl/0002-eina-set-EINA_VALUE_EMPTY-during-library-init.patch b/package/efl/0002-eina-set-EINA_VALUE_EMPTY-during-library-init.patch new file mode 100644 index 0000000000..bfc12fd5b8 --- /dev/null +++ b/package/efl/0002-eina-set-EINA_VALUE_EMPTY-during-library-init.patch @@ -0,0 +1,51 @@ +From b8458ed248cf49bfe9a263d708b5e34adf77e275 Mon Sep 17 00:00:00 2001 +From: Cedric BAIL +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 +Differential Revision: https://phab.enlightenment.org/D9348 + +(cherry picked from commit c46a8143916f0d3f66bbdffc7107c97c88df212d) +[Romain: backport to 1.22.x] +Signed-off-by: Romain Naour +--- + 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 +