felipealmeida pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=93d4ffc9404cc2305c5690417fa0fc287afdf3a5
commit 93d4ffc9404cc2305c5690417fa0fc287afdf3a5 Author: João Paulo Taylor Ienczak Zanette <[email protected]> Date: Thu Feb 13 18:09:29 2020 +0000 csharp: Prevent using system dll for eflcustomexportsmono If EFL is installed system-wide, `CustomExports` would use the system (`/usr`) dll instead of local build's, causing new implemented binding calls to native functions to crash with no entry point found for them. This patch fixes it by ensuring that the local build's `libeflcustomexportsmono.dll` will be used. Reviewed-by: Felipe Magno de Almeida <[email protected]> Differential Revision: https://phab.enlightenment.org/D11343 --- src/bindings/mono/efl_mono.dll.config.in | 1 + src/bindings/mono/meson.build | 1 + 2 files changed, 2 insertions(+) diff --git a/src/bindings/mono/efl_mono.dll.config.in b/src/bindings/mono/efl_mono.dll.config.in index 25d216b1a0..2800c971d5 100644 --- a/src/bindings/mono/efl_mono.dll.config.in +++ b/src/bindings/mono/efl_mono.dll.config.in @@ -23,4 +23,5 @@ <dllmap dll="evas" target="@EVAS@"/> <dllmap dll="eldbus" target="@ELDBUS@"/> <dllmap dll="elementary" target="@ELEMENTARY@"/> + <dllmap dll="eflcustomexportsmono" target="@EFLCUSTOMEXPORTSMONO@"/> </configuration> diff --git a/src/bindings/mono/meson.build b/src/bindings/mono/meson.build index ed2f58d508..74f2d06de7 100644 --- a/src/bindings/mono/meson.build +++ b/src/bindings/mono/meson.build @@ -122,6 +122,7 @@ efl_mono_conf_data.set('EO', eo_lib.full_path()) efl_mono_conf_data.set('EVAS', evas_lib.full_path()) efl_mono_conf_data.set('ELDBUS', eldbus_lib.full_path()) efl_mono_conf_data.set('ELEMENTARY', elementary_lib.full_path()) +efl_mono_conf_data.set('EFLCUSTOMEXPORTSMONO', efl_mono_lib.full_path()) efl_mono_dll_config = configure_file(input : 'efl_mono.dll.config.in', output : 'efl_mono.dll.config', --
