forked from openkylin/efl
correct edje pkg-config generation for luaold
Origin: other Forwarded: no Last-Update: 2019-12-24 edje.pc gets its lua Requies entry from -Dlua-interpreter. But it should get the appropriate versioned entry instead. Last-Update: 2019-12-24 Gbp-Pq: Name 25_edje_check_luaold.diff
This commit is contained in:
parent
42784efc91
commit
ccccb5c2ed
23
meson.build
23
meson.build
|
@ -268,6 +268,27 @@ else
|
|||
]
|
||||
endif
|
||||
|
||||
luaold_interpreters = [
|
||||
['lua', ['>=5.1.0','<5.3.0']],
|
||||
['lua51', ['>=5.1.0','<5.2.0']],
|
||||
['lua-5.1', ['>=5.1.0','<5.2.0']],
|
||||
['lua5.1', ['>=5.1.0','<5.2.0']],
|
||||
['lua52', ['>=5.2.0','<5.3.0']],
|
||||
['lua-5.2', ['>=5.2.0','<5.3.0']],
|
||||
['lua5.2', ['>=5.2.0','<5.3.0']],
|
||||
]
|
||||
|
||||
if get_option('lua-interpreter') == 'lua'
|
||||
foreach l : luaold_interpreters
|
||||
lua = dependency(l[0], version: l[1], required:false)
|
||||
if lua.found() == true
|
||||
break
|
||||
endif
|
||||
endforeach
|
||||
else
|
||||
lua = dependency(get_option('lua-interpreter'))
|
||||
endif
|
||||
|
||||
subprojects = [
|
||||
# name | option | mod | lib | bin | bench | tests | examples | pkg-config options | name of static libs
|
||||
['evil' ,[] , false, true, false, false, false, false, [], []],
|
||||
|
@ -306,7 +327,7 @@ subprojects = [
|
|||
['efreet' ,[] , false, false, true, false, false, false, ['eina', 'efl', 'eo'], []],
|
||||
['ecore_imf_evas' ,[] , false, true, false, false, false, false, ['eina', 'efl', 'eo'], []],
|
||||
['ephysics' ,['physics'] , false, true, false, false, false, false, ['eina', 'efl', 'eo'], []],
|
||||
['edje' ,[] , false, true, true, false, true, true, ['evas', 'eo', 'efl', get_option('lua-interpreter')], []],
|
||||
['edje' ,[] , false, true, true, false, true, true, ['evas', 'eo', 'efl', lua], []],
|
||||
['emotion' ,[] , true, true, false, false, true, true, ['eina', 'efl', 'eo'], []],
|
||||
['ethumb' ,[] , true, true, true, false, false, false, ['eina', 'efl', 'eo'], []],
|
||||
['ethumb_client' ,[] , false, true, true, false, false, true, ['eina', 'efl', 'eo', 'ethumb'], []],
|
||||
|
|
Loading…
Reference in New Issue