1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
From dbf4268f130ca7cc4b68b4b8c986ee19f94007e3 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sun, 29 Jan 2017 09:59:40 +0000
Subject: [PATCH] pkg, db: support $checkdepends variable
---
aports/db.lua | 6 ++++--
aports/pkg.lua | 3 +++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/aports/db.lua b/aports/db.lua
index 09afaeb..407a3d9 100644
--- a/aports/db.lua
+++ b/aports/db.lua
@@ -55,13 +55,14 @@ local function split_apkbuild(line)
return nil
end
local r = {}
- local dir,pkgname, pkgver, pkgrel, arch, options, depends, makedepends, subpackages, linguas, source, url = string.match(line, "([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)")
+ local dir,pkgname, pkgver, pkgrel, arch, options, depends, makedepends, checkdepends, subpackages, linguas, source, url = string.match(line, "([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)|([^|]*)")
r.dir = dir
r.pkgname = pkgname
r.pkgver = pkgver
r.pkgrel = pkgrel
r.depends = split_deps(depends)
r.makedepends = split_deps(makedepends)
+ r.checkdepends = split_deps(checkdepends)
r.linguas = split(linguas)
r.subpackages = split_subpkgs(subpackages, r.linguas, pkgname)
r.source = split(source)
@@ -93,6 +94,7 @@ local function apkbuilds_open(aportsdir, repos)
options=
depends=
makedepends=
+ checkdepends=
subpackages=
linguas=
source=
@@ -101,7 +103,7 @@ local function apkbuilds_open(aportsdir, repos)
[ -n "$dir" ] || exit 1;
cd "$dir";
. ./APKBUILD;
- echo $dir\|$pkgname\|$pkgver\|$pkgrel\|$arch\|$options\|$depends\|$makedepends\|$subpackages\|$linguas\|$source\|$url ;
+ echo $dir\|$pkgname\|$pkgver\|$pkgrel\|$arch\|$options\|$depends\|$makedepends\|$checkdepends\|$subpackages\|$linguas\|$source\|$url ;
done;
]])
obj.read = function(self)
diff --git a/aports/pkg.lua b/aports/pkg.lua
index f21f352..5d40db5 100644
--- a/aports/pkg.lua
+++ b/aports/pkg.lua
@@ -110,6 +110,9 @@ function M.each_dependency(pkg)
for _,dep in pairs(pkg.makedepends or {}) do
coroutine.yield(dep)
end
+ for _,dep in pairs(pkg.checkdepends or {}) do
+ coroutine.yield(dep)
+ end
end)
end
--
2.13.2
|
