package/efl: add in-tree eina library path

Message ID 20180206082114.3434-1-romain.naour@gmail.com
State New
Headers show
Series
  • package/efl: add in-tree eina library path
Related show

Commit Message

Romain Naour Feb. 6, 2018, 8:21 a.m.
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 <romain.naour@gmail.com>
---
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

Comments

Arnout Vandecappelle (Essensium/Mind) Feb. 6, 2018, 10:26 p.m. | #1
On 06-02-18 09:21, Romain Naour wrote:
> 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 <romain.naour@gmail.com>
> ---
> There is an issue while rebuilding host-efl, elua is stuck at 100% cpu
> for some reason...

 I meant to ask you life, but forgot:

 Do you mean this problem occurs before or after this patch or both? Or do you
mean: when I reproduce the autobuild failure and then do "make host-efl-rebuild"
after changing something, elua is stuck at 100% cpu?

 Regards,
 Arnout
Thomas Petazzoni Feb. 10, 2018, 3:13 p.m. | #2
Hello,

On Tue, 6 Feb 2018 23:26:58 +0100, Arnout Vandecappelle wrote:

> > There is an issue while rebuilding host-efl, elua is stuck at 100% cpu
> > for some reason...  
> 
>  I meant to ask you life, but forgot:
> 
>  Do you mean this problem occurs before or after this patch or both? Or do you
> mean: when I reproduce the autobuild failure and then do "make host-efl-rebuild"
> after changing something, elua is stuck at 100% cpu?

If I remember correctly the discussion I had with Romain, his patch
fixes the build issue of the autobuilder, but there is a 100% CPU
consumption problem when doing a rebuild (which wouldn't be caught by
the autobuilders, because we don't do rebuilds).

Thomas

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 <romain.naour@gmail.com>
+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 <romain.naour@gmail.com>
+Cc: Daniel Kolesa <d.kolesa@samsung.com>
+---
+ 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