[gnome-software/wip/hadess/meson-fixes: 2/2] build: Remove support for older versions of meson
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/hadess/meson-fixes: 2/2] build: Remove support for older versions of meson
- Date: Fri, 21 Feb 2020 15:58:11 +0000 (UTC)
commit 6a41bb4a6d5032be760346197410219e94ae36fa
Author: Bastien Nocera <hadess hadess net>
Date: Fri Feb 21 16:49:29 2020 +0100
build: Remove support for older versions of meson
Those were workarounds for versions of meson that were older than the
minimum meson version.
meson.build | 30 ++----------------------------
1 file changed, 2 insertions(+), 28 deletions(-)
---
diff --git a/meson.build b/meson.build
index a51dd784..f515b607 100644
--- a/meson.build
+++ b/meson.build
@@ -116,15 +116,8 @@ if get_option('mogwai')
endif
if get_option('valgrind')
- message(meson.version())
- # urgh, meson is broken
- if meson.version().version_compare('>0.41.0')
- valgrind = dependency('valgrind')
- conf.set('USE_VALGRIND', 1)
- else
- message('Valgrind integration disabled to work around a meson bug')
- valgrind = []
- endif
+ valgrind = dependency('valgrind')
+ conf.set('USE_VALGRIND', 1)
else
message('Valgrind integration disabled')
valgrind = []
@@ -237,24 +230,5 @@ subdir('src')
subdir('po')
subdir('doc')
-if meson.version().version_compare('<0.41.0')
- archiver = find_program('git', required : false)
- if archiver.found()
- run_target('dist',
- # git config tar.tar.xz.command "xz -c"
- command: [
- 'git', 'archive',
- '--prefix=' + meson.project_name() + '-' + meson.project_version() + '/',
- 'HEAD',
- '--format=tar.xz',
- '--output',
- meson.project_name() + '-' + meson.project_version() + '.tar.xz'
- ]
- )
- else
- message('git not found, you will not be able to run `ninja dist`')
- endif
-endif
-
# FIXME: remove when https://github.com/mesonbuild/meson/issues/837 fixed
meson.add_install_script('meson_post_install.sh')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]