summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2014-05-13 16:14:40 (EDT)
committer P. J. McDermott <pj@pehjota.net>2014-05-13 16:29:36 (EDT)
commita12b73bf4fb0de46b01609f402826253fb4f1a2c (patch)
treeb3753073bb424f5ab6ba55ff3f4add0662de881b
parent3eb0ae0d5fd70a6156c6919a0e21d6fd2e609c1c (diff)
Add patch to set substvars in build deps.
-rw-r--r--patches/01_ob-checkbuilddeps-set-substvars.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/01_ob-checkbuilddeps-set-substvars.patch b/patches/01_ob-checkbuilddeps-set-substvars.patch
new file mode 100644
index 0000000..4eff20e
--- /dev/null
+++ b/patches/01_ob-checkbuilddeps-set-substvars.patch
@@ -0,0 +1,31 @@
+From: "P. J. McDermott" <pj@pehjota.net>
+Origin: upstream, http://git.proteanos.com/opkbuild/opkbuild.git/commit/?id=512bdbe
+Date: Tue, 13 May 2014 16:01:35 -0400
+Subject: ob-checkbuilddeps: Set substvars.
+
+ob_set_package_substvars() expects the name of a binary package as an
+argument, even though its implementation for SPF 2.x doesn't use the
+argument and SPF 2.0 doesn't specify any substitution variables that are
+specific to a binary package.
+
+I probably planned to add some binary-specific variables ("Binary"
+maybe?) but never did.
+
+For now we'll just call ob_set_package_substvars() with an empty
+argument.
+---
+ src/ob-checkbuilddeps.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh
+index bb17560..6b41416 100644
+--- a/src/ob-checkbuilddeps.sh
++++ b/src/ob-checkbuilddeps.sh
+@@ -32,6 +32,7 @@ main()
+
+ ob_init_package '..' || exit 1
+ ob_parse_package_metadata -c '.opkbuild.cache' || exit 1
++ ob_set_package_substvars ''
+
+ check_build_deps
+ return ${?}