summaryrefslogtreecommitdiff
path: root/src/lib/elua
diff options
context:
space:
mode:
authorRoss Vandegrift <ross@kallisti.us>2019-12-25 04:33:53 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-12-28 10:47:46 +0100
commit2e854ce7ed5a75249ceb7201411ccb2b83e27a4d (patch)
tree6fd3b353ebf7a312c5abbf7db27be6d9b6df988c /src/lib/elua
parent595a066a64711b9a86808f1399f6ceffbb177370 (diff)
correct edje pkg-config generation for luaold
Currently, edje.pc gets its lua Requires from the -Dlua-interpreter argument. If -Dlua-interpreter=lua, an unversioned lua entry ends up in Requires, which cannot always be satisifed. The evas filters meson.build handles this case by generating a version-specific entry. This patch copies that logic into the top level meson.build, and passes the result to the edje subproject. Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D10965
Diffstat (limited to 'src/lib/elua')
-rw-r--r--src/lib/elua/meson.build13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/lib/elua/meson.build b/src/lib/elua/meson.build
index 33cb3f9733..227d211584 100644
--- a/src/lib/elua/meson.build
+++ b/src/lib/elua/meson.build
@@ -1,16 +1,5 @@
1elua_deps = [eina, eo, efl, ecore, ecore_file, intl] 1elua_deps = [eina, eo, efl, ecore, ecore_file, intl]
2if sys_osx == true 2elua_pub_deps = [lua]
3# 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
4 luajit = dependency('luajit')
5 lua = declare_dependency(
6 include_directories: include_directories(luajit.get_pkgconfig_variable('includedir')),
7 link_args: ['-L'+luajit.get_pkgconfig_variable('libdir'), '-l'+luajit.get_pkgconfig_variable('libname')]
8 )
9 elua_pub_deps = [lua]
10else
11 elua_pub_deps = [dependency('luajit')]
12endif
13
14 3
15elua_src = ['elua.c', 'io.c', 'cache.c'] 4elua_src = ['elua.c', 'io.c', 'cache.c']
16elua_header_src = ['Elua.h'] 5elua_header_src = ['Elua.h']