diff options
| author | Ralph Amissah <ralph@amissah.com> | 2020-03-11 18:38:29 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2020-03-14 15:17:44 -0400 |
| commit | 1468425eab4c03340eaa880a277844f16c06d5a3 (patch) | |
| tree | 07d5d1313dd34cf7d137743dc358229e66e3fd15 | |
| parent | meson build (subproject imageformats pinned 7.0.0) (diff) | |
meson build (subproject issue with imageformats >= 7.0.1)
| -rw-r--r-- | makefile | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | org/spine_build_scaffold.org | 9 | ||||
| -rw-r--r-- | subprojects/imageformats.meson.build | 2 |
4 files changed, 7 insertions, 8 deletions
@@ -104,7 +104,7 @@ meson_get_subprojects: meson_clean_build_dir git add . ; git commit -m"project meson.build added"; \ cd ../.. cd subprojects/imageformats; \ - git checkout -b add_meson_build_patch v7.0.0; \ + git checkout -b add_meson_build_patch; \ cp ../imageformats.meson.build meson.build; \ git add . ; git commit -m"project meson.build added"; \ cd ../.. diff --git a/meson.build b/meson.build index 41d6db3..b483de4 100644 --- a/meson.build +++ b/meson.build @@ -51,7 +51,7 @@ sources_dir = include_directories('src/') # Dependencies dep_dyaml = dependency('dyaml', version: '>= 0.8.0', fallback: ['dyaml', 'dyaml_dep']) dep_d2sqlite3 = dependency('d2sqlite3', version: '>= 0.18.3', fallback: ['d2sqlite3', 'd2sqlite3_dep']) -dep_imageformats = dependency('imageformats', version: '>= 7.0.0', fallback: ['imageformats', 'imageformats_dep']) +dep_imageformats = dependency('imageformats', version: '>= 7.0.2', fallback: ['imageformats', 'imageformats_dep']) # Executable spine_exe = executable('spine', [spine_sources], diff --git a/org/spine_build_scaffold.org b/org/spine_build_scaffold.org index 711014b..e594fe0 100644 --- a/org/spine_build_scaffold.org +++ b/org/spine_build_scaffold.org @@ -201,8 +201,7 @@ all_debug: dmd_debug gdc_debug ldc_debug ******** _meson_ build :meson: - bug in build of imageformats > v7.0.0 (currently at 7.0.2) - checkout of v7.0.0 hopefully a tmp fix - (remove when possible & use upstream head) + (try fix meson/ninja/ld.gold for imageformats HEAD) #+BEGIN_SRC makefile :tangle ../makefile meson_clean_build_dir: @@ -218,7 +217,7 @@ meson_get_subprojects: meson_clean_build_dir git add . ; git commit -m"project meson.build added"; \ cd ../.. cd subprojects/imageformats; \ - git checkout -b add_meson_build_patch v7.0.0; \ + git checkout -b add_meson_build_patch; \ cp ../imageformats.meson.build meson.build; \ git add . ; git commit -m"project meson.build added"; \ cd ../.. @@ -1089,7 +1088,7 @@ sources_dir = include_directories('src/') # Dependencies dep_dyaml = dependency('dyaml', version: '>= 0.8.0', fallback: ['dyaml', 'dyaml_dep']) dep_d2sqlite3 = dependency('d2sqlite3', version: '>= 0.18.3', fallback: ['d2sqlite3', 'd2sqlite3_dep']) -dep_imageformats = dependency('imageformats', version: '>= 7.0.0', fallback: ['imageformats', 'imageformats_dep']) +dep_imageformats = dependency('imageformats', version: '>= 7.0.2', fallback: ['imageformats', 'imageformats_dep']) # Executable spine_exe = executable('spine', [spine_sources], @@ -1297,7 +1296,7 @@ revision = head project('imageformats', 'd', meson_version: '>=0.46', license: 'BSL-1.0', - version: '7.0.0' + version: '7.0.2' ) project_soversion = '0' diff --git a/subprojects/imageformats.meson.build b/subprojects/imageformats.meson.build index f9c8855..7c05434 100644 --- a/subprojects/imageformats.meson.build +++ b/subprojects/imageformats.meson.build @@ -1,7 +1,7 @@ project('imageformats', 'd', meson_version: '>=0.46', license: 'BSL-1.0', - version: '7.0.0' + version: '7.0.2' ) project_soversion = '0' |