diff options
| author | P. J. McDermott <pj@pehjota.net> | 2014-09-01 12:30:55 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2014-09-01 12:30:55 (EDT) |
| commit | 1d4d353aef952ab31003682f90de8efffde56ccd (patch) | |
| tree | 310db05f2d61cdd93ea866c6ad11fd5abcce6c23 | |
| parent | 798b3b9190274db5ea34615c1de47a6bf5118552 (diff) | |
package_get_build_deps(): Take arch and plat args
| -rw-r--r-- | lib/cmd/build.sh | 2 | ||||
| -rw-r--r-- | lib/package.sh | 5 | ||||
| -rw-r--r-- | lib/package/2.sh | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lib/cmd/build.sh b/lib/cmd/build.sh index 2e553ed..84f0b3a 100644 --- a/lib/cmd/build.sh +++ b/lib/cmd/build.sh @@ -108,7 +108,7 @@ cmd_build_main() ;; esac - build_deps="$(package_get_build_deps)" + build_deps="$(package_get_build_deps "${arch}" "${plat}")" if [ "x${build_deps}" != 'x' ]; then cmd_build_make_deps_pkg "${root}${dir}" "${rand_x}" \ "${build_deps}" diff --git a/lib/package.sh b/lib/package.sh index 87d0afa..ce95f41 100644 --- a/lib/package.sh +++ b/lib/package.sh @@ -53,5 +53,8 @@ package_init() package_get_build_deps() { - "package_${package_format}_get_build_deps" + local arch="${1}" + local plat="${2}" + + "package_${package_format}_get_build_deps" "${arch}" "${plat}" } diff --git a/lib/package/2.sh b/lib/package/2.sh index a53f655..052d963 100644 --- a/lib/package/2.sh +++ b/lib/package/2.sh @@ -27,6 +27,9 @@ package_2_build_deps= package_2_get_build_deps() { + local arch="${1}" + local plat="${2}" + package_2_build_deps='' parse_control "${package_dir}/control" \ package_2_build_deps_field_cb false '' |