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.

BioArchLinux/r-basicstan/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-biocparallel/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-biocsingular/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++17",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-blockcluster/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-busparse/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-chemminer/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-cliquems/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-colourvalues/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++17",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-ddalpha/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-ddrtree/lilac.py

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

BioArchLinux/r-decontx/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-delayedrandomarray/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-densestbayes/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-differentialregulation/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++17",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-dreamlet/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-fgsea/lilac.py

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

BioArchLinux/r-fs/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-glmmtmb/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-hicdoc/lilac.py

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

BioArchLinux/r-isoband/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-isobayes/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++17",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-kde1d/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-lobstr/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-lpsymphony/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-metabma/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-mixedclust/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-msa2dist/lilac.py

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

BioArchLinux/r-oaqc/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-osqp/lilac.py

@@ -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():

BioArchLinux/r-quickjsr/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-raer/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-rarr/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-rfast/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++17",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-rmixmod/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-robtt/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-rprotobuflib/lilac.py

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

BioArchLinux/r-rtkore/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-sass/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-sccomp/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-scmet/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "GNU make",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-ssnappy/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-tidyr/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-transformr/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-treetools/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++17",
-    )
 
 def post_build():
     git_pkgbuild_commit()

BioArchLinux/r-tweenr/lilac.py

@@ -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(
+    r_pre_build(_G)
-        _G,
-        expect_systemrequirements = "C++11",
-    )
 
 def post_build():
     git_pkgbuild_commit()

lilac-extensions/lilac_r_utils.py

@@ -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:
+    ignored = [
-        raise CheckFailed(f"SystemRequirements have changed: {desc.systemrequirements}")
+        "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: