1 files changed, 15 insertions, 12 deletions
diff --git a/src/ext_depends/D-YAML/meson.build b/src/ext_depends/D-YAML/meson.build
index 8a09d6a..6a33ed6 100644
--- a/src/ext_depends/D-YAML/meson.build
+++ b/src/ext_depends/D-YAML/meson.build
@@ -1,7 +1,6 @@
 project('D-YAML', 'd',
     meson_version: '>=0.40.0',
-    subproject_dir: 'contrib',
-    version: '0.8.4'
+    version: '0.10.0'
 )
 
 project_soversion    = '0'
@@ -9,6 +8,12 @@ project_soversion    = '0'
 src_dir = include_directories('source/')
 pkgc = import('pkgconfig')
 
+d_compiler = meson.get_compiler('d')
+global_d_args = []
+if d_compiler.get_id() == 'gcc'
+  global_d_args += ['-fall-instantiations']
+endif
+
 dyaml_src = [
     'source/dyaml/composer.d',
     'source/dyaml/constructor.d',
@@ -31,17 +36,12 @@ dyaml_src = [
     'source/dyaml/serializer.d',
     'source/dyaml/style.d',
     'source/dyaml/tagdirective.d',
-    'source/dyaml/test/common.d',
-    'source/dyaml/test/compare.d',
     'source/dyaml/test/constructor.d',
-    'source/dyaml/test/emitter.d',
-    'source/dyaml/test/errors.d',
-    'source/dyaml/test/inputoutput.d',
-    'source/dyaml/test/reader.d',
     'source/dyaml/test/representer.d',
-    'source/dyaml/test/resolver.d',
-    'source/dyaml/test/tokens.d',
-    'source/dyaml/token.d'
+    'source/dyaml/test/suite.d',
+    'source/dyaml/test/suitehelpers.d',
+    'source/dyaml/token.d',
+    'source/dyaml/stdsumtype.d'
 ]
 install_subdir('source/dyaml', install_dir: 'include/d/yaml/')
 
@@ -53,12 +53,14 @@ dyaml_lib = library('dyaml',
         dependencies: [tinyendian_dep],
         install: true,
         version: meson.project_version(),
+        d_args: global_d_args,
         soversion: project_soversion
 )
 pkgc.generate(name: 'dyaml',
               libraries: dyaml_lib,
               subdirs: 'd/yaml/',
               version: meson.project_version(),
+              extra_cflags: global_d_args,
               description: 'YAML parser and emitter for the D programming language.'
 )
 
@@ -66,5 +68,6 @@ pkgc.generate(name: 'dyaml',
 dyaml_dep = declare_dependency(
     link_with: dyaml_lib,
     include_directories: [src_dir],
-    dependencies: [tinyendian_dep]
+    dependencies: [tinyendian_dep],
+    compile_args: global_d_args,
 )