r-*: ignore some values in SystemRequirements

GNU make and a C++ compiler are always available, because
make and gcc are dependencies of base-devel.

The ignored values "C++11", "C++17" and "GNU make" indicate
build-time dependencies only.
This commit is contained in:
Pekka Ristola 2023-12-15 07:42:01 +02:00
parent 28979ba757
commit 416dac4abf
No known key found for this signature in database
GPG key ID: 2C20BE716E05213E
46 changed files with 49 additions and 164 deletions

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++17",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++17",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -10,7 +10,6 @@ def pre_build():
r_pre_build(
_G,
expect_license = "Artistic License 2.0",
expect_systemrequirements = "C++11",
)
def post_build():

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++17",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -10,7 +10,6 @@ def pre_build():
r_pre_build(
_G,
expect_license = "MIT + file LICENCE",
expect_systemrequirements = "C++11",
)
def post_build():

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -10,7 +10,6 @@ def pre_build():
r_pre_build(
_G,
expect_license = "file LICENSE",
expect_systemrequirements = "C++11",
)
def post_build():

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++17",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -10,7 +10,6 @@ def pre_build():
r_pre_build(
_G,
expect_license = "GPL-3 + file LICENSE",
expect_systemrequirements = "C++11",
)
def post_build():

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -10,7 +10,6 @@ def pre_build():
r_pre_build(
_G,
expect_license = "Apache License 2.0 | file LICENSE",
expect_systemrequirements = "C++17",
)
def post_build():

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++17",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -10,7 +10,6 @@ def pre_build():
r_pre_build(
_G,
expect_license = "BSD_3_clause",
expect_systemrequirements = "GNU make",
)
def post_build():

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "GNU make",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++17",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -7,10 +7,7 @@ sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions'))
from lilac_r_utils import r_pre_build
def pre_build():
r_pre_build(
_G,
expect_systemrequirements = "C++11",
)
r_pre_build(_G)
def post_build():
git_pkgbuild_commit()

View file

@ -315,8 +315,16 @@ def check_fortran(pkg: Pkgbuild, desc: Description, cfg: CheckConfig):
raise CheckFailed("Unnecessary config 'ignore_fortran_files'")
def check_systemrequirements(pkg: Pkgbuild, desc: Description, cfg: CheckConfig):
if cfg.expect_systemrequirements != desc.systemrequirements:
raise CheckFailed(f"SystemRequirements have changed: {desc.systemrequirements}")
ignored = [
"C++11",
"C++17",
"GNU make",
]
sysrq = desc.systemrequirements
if sysrq in ignored:
sysrq = None
if cfg.expect_systemrequirements != sysrq:
raise CheckFailed(f"SystemRequirements have changed: {sysrq}")
def check_license(pkg: Pkgbuild, desc: Description, cfg: CheckConfig):
if cfg.expect_license is not None: