From patchwork Tue Feb 6 08:21:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 869707 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LQokzKDq"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zbHVJ6BS0z9sR8 for ; Tue, 6 Feb 2018 19:21:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3AFD782756; Tue, 6 Feb 2018 08:21:24 +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 b7Po+2zZzwJR; Tue, 6 Feb 2018 08:21:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 969DA824E0; Tue, 6 Feb 2018 08:21:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 60F601BFB70 for ; Tue, 6 Feb 2018 08:21:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5CBE782B92 for ; Tue, 6 Feb 2018 08:21:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J49t88BTjenX for ; Tue, 6 Feb 2018 08:21:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f172.google.com (mail-wr0-f172.google.com [209.85.128.172]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0BAC98222B for ; Tue, 6 Feb 2018 08:21:19 +0000 (UTC) Received: by mail-wr0-f172.google.com with SMTP id a43so959893wrc.4 for ; Tue, 06 Feb 2018 00:21:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=eTVKHA2eNgp0eOYttZ2tjZFWCh0vcSIUz2voN7bXA4c=; b=LQokzKDq4L7Pb22eaVlxD//8oZ7Uu1hZHKWICOGjDllRsxatLHWMiGlbNQKrsIfhzU SDcqXRMJW33pk8qaqd6ykgsKbjbKEtTLG9xBHB5prccWtQ9fptPFXdisvGlZa1jOVAdK MlAbZocSa8IzZGeapZGJvs1cKB0NPENfTPM23X/kM1vYypCb3i0X05z0IUng6K4KQQd6 KI+BjzI5qmy0aY8IVQwt0mz+pYH09WyTSuww0BuRz3717sY4r7rjWcdq6Lc2c7PkXjBL /9+kK2ICOzRdkpYyUw3QYVwcfwS0By9wSSjTHq4u1PInzBQ0xHYphgTkhlFS4sV5rd8/ WrFA== 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; bh=eTVKHA2eNgp0eOYttZ2tjZFWCh0vcSIUz2voN7bXA4c=; b=BiGSo04HPybRUo2AwtspKTjO4g13UprEeWxC9wHj/ogJ0+oHKKtyjVp/q1xO7K3p/R q4No2vzsZ/Z05ei2hsY+fd3X+HCKdIs9jukLSSKlT0p9rgpB350UgjKBEz4TBDQIa90h 9O4dvndUZ0VepmxrCOef/4QvOsOAHy5UlZbiMPl8rpOaTuaZA1VmPeQl2K+II6L387WS fsoEKmhK3nXDjd9IhGBH+uPwG9I0cp6Inccnu6QS9TV2upC9RpS/OzoXg16+CbDS/ilu WvhWQAGP4Av8XdO50L4chzPIEo1IfE0NDWbiSt55IAqy3FSiw+HHjmjt3ICi6grRe4xQ e/yA== X-Gm-Message-State: APf1xPDELXJdXe1pY9DvXtyJVmD6yJWW9EbTuebIwiopcCJfr2n9aMpO c5qXZEN3ER42AOQxWb0eZEhWn3Bh X-Google-Smtp-Source: AH8x224NVEtYiQYL6Kxaiki1nQYip+RsZFo7oThtTp6bA0kK/lCqa8kiC1s7kI9J+OzxCGbsxATsDA== X-Received: by 10.223.151.158 with SMTP id s30mr1331725wrb.70.1517905277155; Tue, 06 Feb 2018 00:21:17 -0800 (PST) Received: from atlas.localdomain ([2620:0:1055:fd00:d44d:1140:fe0a:ab6b]) by smtp.gmail.com with ESMTPSA id w50sm6496780wrb.33.2018.02.06.00.21.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Feb 2018 00:21:16 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Tue, 6 Feb 2018 09:21:14 +0100 Message-Id: <20180206082114.3434-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.14.3 Subject: [Buildroot] [PATCH] package/efl: add in-tree eina library path X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Make sure that in-tree libeina.so is used when running elua. Reported upstream: https://phab.enlightenment.org/T6670 Fixes: http://autobuild.buildroot.net/?reason=host-efl-1.20.6 Signed-off-by: Romain Naour --- There is an issue while rebuilding host-efl, elua is stuck at 100% cpu for some reason... --- ...eina-in-environment-variable-library-path.patch | 46 ++++++++++++++++++++++ package/efl/efl.mk | 4 ++ 2 files changed, 50 insertions(+) create mode 100644 package/efl/0001-elua-add-eina-in-environment-variable-library-path.patch diff --git a/package/efl/0001-elua-add-eina-in-environment-variable-library-path.patch b/package/efl/0001-elua-add-eina-in-environment-variable-library-path.patch new file mode 100644 index 0000000000..678a4a9a45 --- /dev/null +++ b/package/efl/0001-elua-add-eina-in-environment-variable-library-path.patch @@ -0,0 +1,46 @@ +From 62941e4d921a00a855a37516e6b8eabcb67f67e8 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Mon, 5 Feb 2018 15:07:15 +0100 +Subject: [PATCH] elua: add eina in environment variable library path + +In-tree libeina.so library path is missing while running elua. + +ELUA lib/ecore_con/efl_net_socket.eo.lua +ERR<8533>:elua lib/elua/elua.c:714 _elua_errmsg() ../src/bin/elua/elua: ...t/build/host-efl-1.20.6/src/bindings/luajit/eina/log.lua:53: libeina.so: cannot open shared object file: No such file or directory +stack traceback: + [C]: in function 'error' + ...put/build/host-efl-1.20.6/src/scripts/elua/core/util.lua:162: in function 'lib_load' + ...t/build/host-efl-1.20.6/src/bindings/luajit/eina/log.lua:53: in function <...t/build/host-efl-1.20.6/src/bindings/luajit/eina/log.lua:52> + [C]: in function 'init_module' + ...t/build/host-efl-1.20.6/src/bindings/luajit/eina/log.lua:63: in function 'loader' + ...t/build/host-efl-1.20.6/src/scripts/elua/core/module.lua:94: in function 'require' + ...ild/host-efl-1.20.6/src/scripts/elua/modules/lualian.lua:5: in function 'loader' + ...t/build/host-efl-1.20.6/src/scripts/elua/core/module.lua:94: in function 'require' + .../build/host-efl-1.20.6/src/scripts/elua/apps/lualian.lua:4: in main chunk + [C]: at 0x56278e3a6840 + +http://autobuild.buildroot.net/results/2bb/2bbe89694c206d764d51a5dd9c75bc4aa844e98d/build-end.log + +@ref T6670 + +Signed-off-by: Romain Naour +Cc: Daniel Kolesa +--- + src/Makefile_Elua_Helper.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Makefile_Elua_Helper.am b/src/Makefile_Elua_Helper.am +index a204e259fa..fa8782af4b 100644 +--- a/src/Makefile_Elua_Helper.am ++++ b/src/Makefile_Elua_Helper.am +@@ -3,6 +3,7 @@ ELUA_GEN = @elua_bin@ lualian + _ELUA_GEN_DEP = @elua_bin@ + else + ELUA_GEN = ELUA_EOLIAN_LIBRARY_PATH=$(top_builddir)/src/lib/eolian/.libs \ ++ ELUA_EINA_LIBRARY_PATH=$(top_builddir)/src/lib/eina/.libs \ + $(top_builddir)/src/bin/elua/elua${EXEEXT} \ + -I$(ELUA_BINDINGS_DIR) -C$(ELUA_CORE_DIR) -M$(ELUA_MODULES_DIR) \ + -A$(ELUA_APPS_DIR) lualian +-- +2.14.3 + diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 5a82479ff5..ff0cc8c38b 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -19,6 +19,10 @@ EFL_LICENSE_FILES = \ EFL_INSTALL_STAGING = YES +# 0001-elua-add-eina-in-environment-variable-library-path.patch +EFL_AUTORECONF = YES +EFL_GETTEXTIZE = YES + EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \ jpeg luajit lz4 zlib