summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorIsmael Luceno2021-02-13 18:35:48 +0100
committerIsmael Luceno2021-02-13 19:02:43 +0100
commit217f1108f14e135085ccaa9a85fe3596514e85b5 (patch)
treeab44e7be8fd5b53d6668263de149f00245b5d045 /net
parentd523cfc301c17731bde576b86a0cea5f30dcade2 (diff)
Add improved vdepends implementation
Example: LANGS="ADA,FORTRAN" LANGFLAGS="--enable-ada --enable-fortran" vdepends << EOF gcc[$LANGS] >= 6.0 < 7.0 flags: $LANGFLAGS binutils[LIBERTY] >= 2.35 flags: --with-liberty EOF This changes the format and adds support for: - chained comparisons - sub-dependencies - comment lines Now the check is done against the grimoire version of the spell too, to avoid casting a spell that can't satisfy the dependency.
Diffstat (limited to 'net')
-rwxr-xr-xnet/iptables/DEPENDS2
-rwxr-xr-xnet/nftables/DEPENDS2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/iptables/DEPENDS b/net/iptables/DEPENDS
index b48bd0b82d..f9e0cdd94f 100755
--- a/net/iptables/DEPENDS
+++ b/net/iptables/DEPENDS
@@ -1,4 +1,4 @@
-. "$GRIMOIRE"/FUNCTIONS &&
+. "$GRIMOIRE"/VDEPENDS &&
depends libmnl &&
optional_depends libnftnl '' '--disable-nftables' 'nftabels support' &&
if is_depends_enabled "$SPELL" libnftnl; then
diff --git a/net/nftables/DEPENDS b/net/nftables/DEPENDS
index de7d59633c..8e75eb2c6a 100755
--- a/net/nftables/DEPENDS
+++ b/net/nftables/DEPENDS
@@ -1,4 +1,4 @@
-. "$GRIMOIRE"/FUNCTIONS &&
+. "$GRIMOIRE"/VDEPENDS &&
vdepends <<EOF
libmnl
libnftnl >= 1.1.8