diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-06-24 13:04:33 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-06-24 13:04:33 +0800 |
| commit | 1660e10b4a2f0a24bad5be0d4349d293bbe75a47 (patch) | |
| tree | 9ff293dd9aed5267187ed38ea96f91630059bcc6 /Mk | |
| parent | f2a268bff6d03e6829142057d8417620d6627619 (diff) | |
| download | freebsd-ports-gnome-1660e10b4a2f0a24bad5be0d4349d293bbe75a47.tar.gz freebsd-ports-gnome-1660e10b4a2f0a24bad5be0d4349d293bbe75a47.tar.zst freebsd-ports-gnome-1660e10b4a2f0a24bad5be0d4349d293bbe75a47.zip | |
Fix package depends install not respecting DEPENDS_ARGS for the PKGFILE lookup.
This also optimizes the PKGBASE/PKGFILE lookup with the new port_var_fetch(),
which passes in the known DEPENDS_ARGS.
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Scripts/do-depends.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh index 03d85c61e0ff..399a999859f4 100644 --- a/Mk/Scripts/do-depends.sh +++ b/Mk/Scripts/do-depends.sh @@ -27,12 +27,10 @@ install_depends() return 0 fi - read pkgfile <<- EOF - $(${dp_MAKE} -C ${origin} -VPKGFILE) - EOF - read pkgbase <<- EOF - $(${dp_MAKE} -C ${origin} -VPKGBASE) - EOF + port_var_fetch "${origin}" "${depends_args}" \ + PKGFILE pkgfile \ + PKGBASE pkgbase + if [ -r "${pkgfile}" -a "${target}" = "${dp_DEPENDS_TARGET}" ]; then echo "===> Installing existing package ${pkgfile}" if [ "${pkgbase}" = "pkg" ]; then |