diff options
| -rw-r--r-- | manual tests/1 wrap/meson.build | 13 | ||||
| -rw-r--r-- | manual tests/1 wrap/subprojects/sqlite.wrap | 6 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 4 |
3 files changed, 10 insertions, 13 deletions
diff --git a/manual tests/1 wrap/meson.build b/manual tests/1 wrap/meson.build index 99ea260..aee358d 100644 --- a/manual tests/1 wrap/meson.build +++ b/manual tests/1 wrap/meson.build @@ -1,14 +1,13 @@ project('downloader', 'c') -s = subproject('sqlite') +cc = meson.get_compiler('c') -libdl = find_library('dl', required : false) +s = subproject('sqlite').get_variable('sqlite_dep') +th = dependency('threads') + +libdl = cc.find_library('dl', required : false) e = executable('dtest', 'main.c', - include_directories : s.get_variable('sqinc'), - link_args : ['-pthread'], - c_args : '-pthread', - dependencies : libdl, - link_with : s.get_variable('sqlib')) + dependencies : [th, libdl, s]) test('dltest', e) diff --git a/manual tests/1 wrap/subprojects/sqlite.wrap b/manual tests/1 wrap/subprojects/sqlite.wrap index cf6ff7a..6d14949 100644 --- a/manual tests/1 wrap/subprojects/sqlite.wrap +++ b/manual tests/1 wrap/subprojects/sqlite.wrap @@ -5,6 +5,6 @@ source_url = http://sqlite.com/2015/sqlite-amalgamation-3080802.zip source_filename = sqlite-amalgamation-3080802.zip source_hash = 5ebeea0dfb75d090ea0e7ff84799b2a7a1550db3fe61eb5f6f61c2e971e57663 -patch_url = http://wrapdb.mesonbuild.com/v1/projects/sqlite/3080802/2/get_zip -patch_filename = sqlite-3080802-2-wrap.zip -patch_hash = 300eb0e16cf7d32e873f16617de959c0a3e914614c5fddcff858fc010db10688 +patch_url = https://wrapdb.mesonbuild.com/v1/projects/sqlite/3080802/5/get_zip +patch_filename = sqlite-3080802-5-wrap.zip +patch_hash = d66469a73fa1344562d56a1d7627d5d0ee4044a77b32d16cf4bbb85741d4c9fd diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 98ce933..a105cb8 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -723,14 +723,12 @@ def get_args_from_envvars(lang): class CrossBuildInfo(): def __init__(self, filename): - self.config = {} + self.config = {'properties': {}} self.parse_datafile(filename) if 'target_machine' in self.config: return if not 'host_machine' in self.config: raise mesonlib.MesonException('Cross info file must have either host or a target machine.') - if not 'properties' in self.config: - raise mesonlib.MesonException('Cross file is missing "properties".') if not 'binaries' in self.config: raise mesonlib.MesonException('Cross file is missing "binaries".') |