Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 914749 | Differences between
and this patch

Collapse All | Expand All

(-)a/meson.build (-15 / +7 lines)
Lines 138-155 if host_machine.system() == 'windows' and not python3_dep.found() Link Here
138
endif
138
endif
139
139
140
pygobject_dep = dependency('pygobject-3.0', version: pygobject_req, required: false)
140
pygobject_dep = dependency('pygobject-3.0', version: pygobject_req, required: false)
141
lua51_dep = dependency('lua51', version: lua_req, required: false)
141
lua51_dep = dependency('lua', version: lua_req, required: get_option('lua51'))
142
if not lua51_dep.found()
142
luajit_dep = dependency('luajit', version: luajit_req, required: get_option('luajit'))
143
  lua51_dep = dependency('lua-5.1', version: lua_req, required: false)
144
endif
145
luajit_dep = dependency('luajit', version: luajit_req, required: false)
146
lua_lgi_found = false
143
lua_lgi_found = false
147
lua_lgi_ver = 'not found'
144
lua_lgi_ver = 'not found'
148
lua51_prg = find_program('lua5.1', required: false)
145
lua51_prg = find_program('lua', required: get_option('lua51'))
149
if not lua51_prg.found()
146
luajit_prg = find_program('luajit', required: get_option('luajit'))
150
  lua51_prg = find_program('lua51', required: false)
151
endif
152
luajit_prg = find_program('luajit', required: false)
153
xmllint_prg = find_program('xmllint', required: false)
147
xmllint_prg = find_program('xmllint', required: false)
154
generate_vapi = get_option('vapi')
148
generate_vapi = get_option('vapi')
155
vapigen_prg = find_program('vapigen', required: generate_vapi)
149
vapigen_prg = find_program('vapigen', required: generate_vapi)
Lines 211-216 if lua_found Link Here
211
            lua51_lgi_dep = declare_dependency(version: lua_lgi_ver)
205
            lua51_lgi_dep = declare_dependency(version: lua_lgi_ver)
212
            lua_lgi_found = true
206
            lua_lgi_found = true
213
        endif
207
        endif
208
    else
209
        error('lua support requested but lua-lgi not found')
214
    endif
210
    endif
215
    message('lua-lgi version: ' + lua_lgi_ver)
211
    message('lua-lgi version: ' + lua_lgi_ver)
216
endif
212
endif
Lines 394-404 endif Link Here
394
390
395
build_gjs_loader = get_option('gjs')
391
build_gjs_loader = get_option('gjs')
396
392
397
build_lua51_loader = get_option('lua51')
393
build_lua51_loader = (luajit_dep.found() or lua51_dep.found()) and lua_lgi_found
398
lua51_found = (luajit_dep.found() or lua51_dep.found()) and lua_lgi_found
399
if build_lua51_loader and not lua51_found
400
  error('Lua51 requested but failed to locate suitable Lua51 and LGI support')
401
endif
402
394
403
build_python3_loader = get_option('python3')
395
build_python3_loader = get_option('python3')
404
python3_found = python3_dep.found() and pygobject_dep.found()
396
python3_found = python3_dep.found() and pygobject_dep.found()
(-)a/meson_options.txt (-1 / +5 lines)
Lines 3-11 option('gjs', Link Here
3
       description: 'Enable GJS support (requires gjs-1.0)')
3
       description: 'Enable GJS support (requires gjs-1.0)')
4
4
5
option('lua51',
5
option('lua51',
6
       type: 'boolean', value: true,
6
       type: 'feature', value: 'enabled',
7
       description: 'Enable Lua 5.1 support (requires lua-lgi)')
7
       description: 'Enable Lua 5.1 support (requires lua-lgi)')
8
8
9
option('luajit',
10
       type: 'feature', value: 'disabled',
11
       description: 'Use LuaJIT for Lua 5.1 support (requires lua-lgi)')
12
9
option('python3',
13
option('python3',
10
       type: 'boolean', value: true,
14
       type: 'boolean', value: true,
11
       description: 'Enable Python 3 support (requires pygobject)')
15
       description: 'Enable Python 3 support (requires pygobject)')

Return to bug 914749