From 416dac4abf01ee29fe1c1d05671051ba2524f33f Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Fri, 15 Dec 2023 07:42:01 +0200 Subject: [PATCH] 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 | 5 +---- BioArchLinux/r-biocparallel/lilac.py | 5 +---- BioArchLinux/r-biocsingular/lilac.py | 5 +---- BioArchLinux/r-blockcluster/lilac.py | 5 +---- BioArchLinux/r-busparse/lilac.py | 5 +---- BioArchLinux/r-chemminer/lilac.py | 5 +---- BioArchLinux/r-cliquems/lilac.py | 5 +---- BioArchLinux/r-colourvalues/lilac.py | 5 +---- BioArchLinux/r-ddalpha/lilac.py | 5 +---- BioArchLinux/r-ddrtree/lilac.py | 1 - BioArchLinux/r-decontx/lilac.py | 5 +---- BioArchLinux/r-delayedrandomarray/lilac.py | 5 +---- BioArchLinux/r-densestbayes/lilac.py | 5 +---- BioArchLinux/r-differentialregulation/lilac.py | 5 +---- BioArchLinux/r-dreamlet/lilac.py | 5 +---- BioArchLinux/r-fgsea/lilac.py | 1 - BioArchLinux/r-fs/lilac.py | 5 +---- BioArchLinux/r-glmmtmb/lilac.py | 5 +---- BioArchLinux/r-hicdoc/lilac.py | 1 - BioArchLinux/r-isoband/lilac.py | 5 +---- BioArchLinux/r-isobayes/lilac.py | 5 +---- BioArchLinux/r-kde1d/lilac.py | 5 +---- BioArchLinux/r-lobstr/lilac.py | 5 +---- BioArchLinux/r-lpsymphony/lilac.py | 5 +---- BioArchLinux/r-metabma/lilac.py | 5 +---- BioArchLinux/r-mixedclust/lilac.py | 5 +---- BioArchLinux/r-msa2dist/lilac.py | 1 - BioArchLinux/r-oaqc/lilac.py | 5 +---- BioArchLinux/r-osqp/lilac.py | 1 - BioArchLinux/r-quickjsr/lilac.py | 5 +---- BioArchLinux/r-raer/lilac.py | 5 +---- BioArchLinux/r-rarr/lilac.py | 5 +---- BioArchLinux/r-rfast/lilac.py | 5 +---- BioArchLinux/r-rmixmod/lilac.py | 5 +---- BioArchLinux/r-robtt/lilac.py | 5 +---- BioArchLinux/r-rprotobuflib/lilac.py | 1 - BioArchLinux/r-rtkore/lilac.py | 5 +---- BioArchLinux/r-sass/lilac.py | 5 +---- BioArchLinux/r-sccomp/lilac.py | 5 +---- BioArchLinux/r-scmet/lilac.py | 5 +---- BioArchLinux/r-ssnappy/lilac.py | 5 +---- BioArchLinux/r-tidyr/lilac.py | 5 +---- BioArchLinux/r-transformr/lilac.py | 5 +---- BioArchLinux/r-treetools/lilac.py | 5 +---- BioArchLinux/r-tweenr/lilac.py | 5 +---- lilac-extensions/lilac_r_utils.py | 12 ++++++++++-- 46 files changed, 49 insertions(+), 164 deletions(-) diff --git a/BioArchLinux/r-basicstan/lilac.py b/BioArchLinux/r-basicstan/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-basicstan/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-biocparallel/lilac.py b/BioArchLinux/r-biocparallel/lilac.py index 1b81fdea2e..9244fd6914 100644 --- a/BioArchLinux/r-biocparallel/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-biocsingular/lilac.py b/BioArchLinux/r-biocsingular/lilac.py index 1c788feeff..b5cdb057c5 100644 --- a/BioArchLinux/r-biocsingular/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++17", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-blockcluster/lilac.py b/BioArchLinux/r-blockcluster/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-blockcluster/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-busparse/lilac.py b/BioArchLinux/r-busparse/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-busparse/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-chemminer/lilac.py b/BioArchLinux/r-chemminer/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-chemminer/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-cliquems/lilac.py b/BioArchLinux/r-cliquems/lilac.py index b8fd4ff762..b5cdb057c5 100644 --- a/BioArchLinux/r-cliquems/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-colourvalues/lilac.py b/BioArchLinux/r-colourvalues/lilac.py index 1c788feeff..b5cdb057c5 100644 --- a/BioArchLinux/r-colourvalues/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++17", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-ddalpha/lilac.py b/BioArchLinux/r-ddalpha/lilac.py index b8fd4ff762..b5cdb057c5 100644 --- a/BioArchLinux/r-ddalpha/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-ddrtree/lilac.py b/BioArchLinux/r-ddrtree/lilac.py index 0c79b38556..9b979bf07c 100644 --- a/BioArchLinux/r-ddrtree/lilac.py +++ b/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(): diff --git a/BioArchLinux/r-decontx/lilac.py b/BioArchLinux/r-decontx/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-decontx/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-delayedrandomarray/lilac.py b/BioArchLinux/r-delayedrandomarray/lilac.py index b8fd4ff762..b5cdb057c5 100644 --- a/BioArchLinux/r-delayedrandomarray/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-densestbayes/lilac.py b/BioArchLinux/r-densestbayes/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-densestbayes/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-differentialregulation/lilac.py b/BioArchLinux/r-differentialregulation/lilac.py index 1c788feeff..b5cdb057c5 100644 --- a/BioArchLinux/r-differentialregulation/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++17", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-dreamlet/lilac.py b/BioArchLinux/r-dreamlet/lilac.py index b8fd4ff762..b5cdb057c5 100644 --- a/BioArchLinux/r-dreamlet/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-fgsea/lilac.py b/BioArchLinux/r-fgsea/lilac.py index a6fc1e7a44..0c5002aba1 100644 --- a/BioArchLinux/r-fgsea/lilac.py +++ b/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(): diff --git a/BioArchLinux/r-fs/lilac.py b/BioArchLinux/r-fs/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-fs/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-glmmtmb/lilac.py b/BioArchLinux/r-glmmtmb/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-glmmtmb/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-hicdoc/lilac.py b/BioArchLinux/r-hicdoc/lilac.py index 76084a6c1f..c808eaf563 100644 --- a/BioArchLinux/r-hicdoc/lilac.py +++ b/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(): diff --git a/BioArchLinux/r-isoband/lilac.py b/BioArchLinux/r-isoband/lilac.py index b8fd4ff762..b5cdb057c5 100644 --- a/BioArchLinux/r-isoband/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-isobayes/lilac.py b/BioArchLinux/r-isobayes/lilac.py index 1c788feeff..b5cdb057c5 100644 --- a/BioArchLinux/r-isobayes/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++17", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-kde1d/lilac.py b/BioArchLinux/r-kde1d/lilac.py index b8fd4ff762..b5cdb057c5 100644 --- a/BioArchLinux/r-kde1d/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-lobstr/lilac.py b/BioArchLinux/r-lobstr/lilac.py index b8fd4ff762..b5cdb057c5 100644 --- a/BioArchLinux/r-lobstr/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-lpsymphony/lilac.py b/BioArchLinux/r-lpsymphony/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-lpsymphony/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-metabma/lilac.py b/BioArchLinux/r-metabma/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-metabma/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-mixedclust/lilac.py b/BioArchLinux/r-mixedclust/lilac.py index b8fd4ff762..b5cdb057c5 100644 --- a/BioArchLinux/r-mixedclust/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-msa2dist/lilac.py b/BioArchLinux/r-msa2dist/lilac.py index 7f509ece89..c08ad6cea8 100644 --- a/BioArchLinux/r-msa2dist/lilac.py +++ b/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(): diff --git a/BioArchLinux/r-oaqc/lilac.py b/BioArchLinux/r-oaqc/lilac.py index b8fd4ff762..b5cdb057c5 100644 --- a/BioArchLinux/r-oaqc/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-osqp/lilac.py b/BioArchLinux/r-osqp/lilac.py index 19b94a2c4b..502500b6b3 100644 --- a/BioArchLinux/r-osqp/lilac.py +++ b/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(): diff --git a/BioArchLinux/r-quickjsr/lilac.py b/BioArchLinux/r-quickjsr/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-quickjsr/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-raer/lilac.py b/BioArchLinux/r-raer/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-raer/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-rarr/lilac.py b/BioArchLinux/r-rarr/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-rarr/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-rfast/lilac.py b/BioArchLinux/r-rfast/lilac.py index 1c788feeff..b5cdb057c5 100644 --- a/BioArchLinux/r-rfast/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++17", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-rmixmod/lilac.py b/BioArchLinux/r-rmixmod/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-rmixmod/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-robtt/lilac.py b/BioArchLinux/r-robtt/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-robtt/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-rprotobuflib/lilac.py b/BioArchLinux/r-rprotobuflib/lilac.py index 6759ef759b..059237af7c 100644 --- a/BioArchLinux/r-rprotobuflib/lilac.py +++ b/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(): diff --git a/BioArchLinux/r-rtkore/lilac.py b/BioArchLinux/r-rtkore/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-rtkore/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-sass/lilac.py b/BioArchLinux/r-sass/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-sass/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-sccomp/lilac.py b/BioArchLinux/r-sccomp/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-sccomp/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-scmet/lilac.py b/BioArchLinux/r-scmet/lilac.py index 6cfc1b802b..b5cdb057c5 100644 --- a/BioArchLinux/r-scmet/lilac.py +++ b/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( - _G, - expect_systemrequirements = "GNU make", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-ssnappy/lilac.py b/BioArchLinux/r-ssnappy/lilac.py index b8fd4ff762..b5cdb057c5 100644 --- a/BioArchLinux/r-ssnappy/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-tidyr/lilac.py b/BioArchLinux/r-tidyr/lilac.py index b8fd4ff762..b5cdb057c5 100644 --- a/BioArchLinux/r-tidyr/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-transformr/lilac.py b/BioArchLinux/r-transformr/lilac.py index b8fd4ff762..b5cdb057c5 100644 --- a/BioArchLinux/r-transformr/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-treetools/lilac.py b/BioArchLinux/r-treetools/lilac.py index 1c788feeff..b5cdb057c5 100644 --- a/BioArchLinux/r-treetools/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++17", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-tweenr/lilac.py b/BioArchLinux/r-tweenr/lilac.py index b8fd4ff762..b5cdb057c5 100644 --- a/BioArchLinux/r-tweenr/lilac.py +++ b/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( - _G, - expect_systemrequirements = "C++11", - ) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py index a5724e3a8e..a5755c9d76 100644 --- a/lilac-extensions/lilac_r_utils.py +++ b/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: - 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: