Thomas Heijligen has uploaded this change for review.

View Change

meson: revert to meson version 0.53.0

Debian Bullseye, current stable release, ships only with meson 0.63.2.
Pass arguments to `sphinx-doc` via `'-Dkey=value` instead of environment
variabled to stay with older meson version.

Change-Id: Iff9b8307c741a247a652cf666935c9485fa493fa
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
---
M doc/conf.py
M doc/meson.build
M meson.build
3 files changed, 17 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/61/73361/1

diff --git a/doc/conf.py b/doc/conf.py
index d06f538..79d8aae 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -11,7 +11,6 @@
 project = 'flashrom'
 # copyright = '2023, The flashrom authors'
 author = 'The flashrom authors'
-release = os.getenv('FLASHROM_VERSION')
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
diff --git a/doc/meson.build b/doc/meson.build
index bdf4493..8826e33 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -14,8 +14,7 @@
 
     custom_target(
       'man-pages',
-      command : [sphinx, '-b', 'man', '-q', '-d', '@PRIVATE_DIR@', '@CURRENT_SOURCE_DIR@', '@OUTDIR@'],
-      env     : {'FLASHROM_VERSION' : meson.project_version() },
+      command : [sphinx, '-b', 'man', '-q', '-d', '@PRIVATE_DIR@', '-Drelease=' + meson.project_version(),'@CURRENT_SOURCE_DIR@', '@OUTDIR@'],
       build_always_stale : true, # sphinx handles rebuilds
       output  : man_outputs,
       install : true,
@@ -26,8 +25,7 @@
   if get_option('documentation').auto() or get_option('documtation').enabled()
     custom_target(
       'documentation',
-      command : [sphinx, '-b', 'html', '-q', '-d', '@PRIVATE_DIR@', '@CURRENT_SOURCE_DIR@', '@OUTDIR@/html'],
-      env     : {'FLASHROM_VERSION' : meson.project_version() },
+      command : [sphinx, '-b', 'html', '-q', '-d', '@PRIVATE_DIR@', '-Drelease=' + meson.project_version(),'@CURRENT_SOURCE_DIR@', '@OUTDIR@/html'],
       build_always_stale : true, # sphinx handles rebuilds
       output  : 'html',
       install : true,
diff --git a/meson.build b/meson.build
index caeea6e..2ecb5fa 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('flashromutils', 'c',
   version : run_command('util/getversion.sh', '--version', check : true).stdout().strip(),
   license : 'GPL-2.0',
-  meson_version : '>=0.57.0',
+  meson_version : '>=0.53.0',
   default_options : [
     'warning_level=2',
     'c_std=c99',

To view, visit change 73361. To unsubscribe, or for help writing mail filters, visit settings.