openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

meson: revert to meson version 0.53.0

Browse Source 
Debian Bullseye, current stable release, ships only with meson 0.56.2.

To go back to an older meson version pass the project_version info as
parameter to `sphinx-build` instead of using an environment variable.
This is done by overriding the `release` variable in conf.py with
`-Drelease=meson.project_version()` at the command line call.

Change-Id: Iff9b8307c741a247a652cf666935c9485fa493fa
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/73361
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Alexander Goncharov <chat@joursoir.net>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
This commit is contained in:
Thomas Heijligen 2023-03-01 21:30:45 +01:00 committed by Thomas Heijligen
parent e1f30bbce7
commit c39db191d8
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/conf.py
View File

@ -11,7 +11,6 @@ import os
project = 'flashrom' project = 'flashrom'
# copyright = '2023, The flashrom authors' # copyright = '2023, The flashrom authors'
author = 'The flashrom authors' author = 'The flashrom authors'
release = os.getenv('FLASHROM_VERSION')
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

6
doc/meson.build
View File

@ -14,8 +14,7 @@ if sphinx.found()
custom_target( custom_target(
'man-pages', 'man-pages',
command : [sphinx, '-b', 'man', '-q', '-d', '@PRIVATE_DIR@', '@CURRENT_SOURCE_DIR@', '@OUTDIR@'], command : [sphinx, '-b', 'man', '-q', '-d', '@PRIVATE_DIR@', '-Drelease=' + meson.project_version(),'@CURRENT_SOURCE_DIR@', '@OUTDIR@'],
env : {'FLASHROM_VERSION' : meson.project_version() },
build_always_stale : true, # sphinx handles rebuilds build_always_stale : true, # sphinx handles rebuilds
output : man_outputs, output : man_outputs,
install : true, install : true,
@ -26,8 +25,7 @@ if sphinx.found()
if get_option('documentation').auto() or get_option('documtation').enabled() if get_option('documentation').auto() or get_option('documtation').enabled()
custom_target( custom_target(
'documentation', 'documentation',
command : [sphinx, '-b', 'html', '-q', '-d', '@PRIVATE_DIR@', '@CURRENT_SOURCE_DIR@', '@OUTDIR@/html'], command : [sphinx, '-b', 'html', '-q', '-d', '@PRIVATE_DIR@', '-Drelease=' + meson.project_version(),'@CURRENT_SOURCE_DIR@', '@OUTDIR@/html'],
env : {'FLASHROM_VERSION' : meson.project_version() },
build_always_stale : true, # sphinx handles rebuilds build_always_stale : true, # sphinx handles rebuilds
output : 'html', output : 'html',
install : true, install : true,

2
meson.build
View File

@ -1,7 +1,7 @@
project('flashromutils', 'c', project('flashromutils', 'c',
version : run_command('util/getversion.sh', '--version', check : true).stdout().strip(), version : run_command('util/getversion.sh', '--version', check : true).stdout().strip(),
license : 'GPL-2.0', license : 'GPL-2.0',
meson_version : '>=0.57.0', meson_version : '>=0.53.0',
default_options : [ default_options : [
'warning_level=2', 'warning_level=2',
'c_std=c99', 'c_std=c99',