From a6d256cb6a53571d399b40c01c71d249b70a037c Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Fri, 22 Feb 2019 08:53:19 -0500 Subject: [PATCH] build: fix macos build Summary: it the .pc file of luajit carries linker flags that causes compilation fails on macos, thus we need to split up the .pc file into our own dependency, and use it with causion Reviewers: zmike, cedric, segfaultxavi Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7995 --- src/bin/elua/meson.build | 1 + src/lib/elua/meson.build | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/bin/elua/meson.build b/src/bin/elua/meson.build index 3a4908d754..a43eca2766 100644 --- a/src/bin/elua/meson.build +++ b/src/bin/elua/meson.build @@ -1,5 +1,6 @@ executable('elua', 'main.c', dependencies: [eina, ecore, elua, intl], + link_args : bin_linker_args, install: true, ) diff --git a/src/lib/elua/meson.build b/src/lib/elua/meson.build index 9f1d270bba..33cb3f9733 100644 --- a/src/lib/elua/meson.build +++ b/src/lib/elua/meson.build @@ -1,5 +1,16 @@ elua_deps = [eina, eo, efl, ecore, ecore_file, intl] -elua_pub_deps = [dependency('luajit')] +if sys_osx == true +# luajit on macro is broken, this means we need to generate our own dependency with our arguments, a library later still needs to link to luajit for the pagesize argument thingy + luajit = dependency('luajit') + lua = declare_dependency( + include_directories: include_directories(luajit.get_pkgconfig_variable('includedir')), + link_args: ['-L'+luajit.get_pkgconfig_variable('libdir'), '-l'+luajit.get_pkgconfig_variable('libname')] + ) + elua_pub_deps = [lua] +else + elua_pub_deps = [dependency('luajit')] +endif + elua_src = ['elua.c', 'io.c', 'cache.c'] elua_header_src = ['Elua.h']