diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-04 22:18:29 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-04 22:18:29 +0000 |
| commit | baf3ba05d0f9d697fb380b96fb593cbeee1d00d5 (patch) | |
| tree | 3e5722a0f68a4fd05162b530b6052b6173ff9dc7 | |
| parent | Partially revert r401242 to fix build with PYTHON option turned on. Note (diff) | |
Use normal PORTSDIR rather than dp_PORTSDIR so it is passed around properly.
This fixes errors when PORTSDIR is not set and /usr/ports is not used. The
/usr/share/bsd.port.mk logic will auto set PORTSDIR, but this was not being
passed into children in the dependency scripts.
With hat: portmgr
Reported by: bapt
Notes
Notes:
svn path=/head/; revision=403013
| -rw-r--r-- | Mk/Scripts/depends-list.sh | 6 | ||||
| -rw-r--r-- | Mk/Scripts/do-depends.sh | 4 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Mk/Scripts/depends-list.sh b/Mk/Scripts/depends-list.sh index 21b7ec103661..4b2d7833070a 100644 --- a/Mk/Scripts/depends-list.sh +++ b/Mk/Scripts/depends-list.sh @@ -26,12 +26,12 @@ while getopts "rw" FLAG; do done shift $((OPTIND-1)) -validate_env dp_PORTSDIR dp_PKGNAME +validate_env PORTSDIR dp_PKGNAME if [ ${recursive} -eq 1 -o ${requires_wrkdir} -eq 1 ]; then validate_env dp_MAKE # Cache command executions to avoid looking them up again in every # sub-make. - MAKE="${dp_MAKE}" PORTSDIR="${dp_PORTSDIR}" export_ports_env >/dev/null + MAKE="${dp_MAKE}" export_ports_env >/dev/null fi set -u @@ -47,7 +47,7 @@ check_dep() { case "${2}" in /*) d=${2} ;; - *) d=${dp_PORTSDIR}/${2} ;; + *) d=${PORTSDIR}/${2} ;; esac case " ${checked} " in diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh index abd400b26f05..4bbddccf2a65 100644 --- a/Mk/Scripts/do-depends.sh +++ b/Mk/Scripts/do-depends.sh @@ -11,7 +11,7 @@ validate_env dp_RAWDEPENDS dp_DEPTYPE dp_DEPENDS_TARGET dp_DEPENDS_PRECLEAN \ dp_DEPENDS_CLEAN dp_DEPENDS_ARGS dp_USE_PACKAGE_DEPENDS \ dp_USE_PACKAGE_DEPENDS_ONLY dp_PKG_ADD dp_PKG_INFO dp_WRKDIR \ dp_PKGNAME dp_STRICT_DEPENDS dp_LOCALBASE dp_LIB_DIRS dp_SH \ - dp_SCRIPTSDIR dp_PORTSDIR dp_MAKE + dp_SCRIPTSDIR PORTSDIR dp_MAKE set -u @@ -123,7 +123,7 @@ for _line in ${dp_RAWDEPENDS} ; do case "${origin}" in /*) ;; - *) origin="${dp_PORTSDIR}/${origin}" ;; + *) origin="${PORTSDIR}/${origin}" ;; esac depends_args="${dp_DEPENDS_ARGS}" diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 15bfb31aa717..a4aaafe987a0 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -4350,7 +4350,7 @@ ${deptype:tl}-depends: dp_LIB_DIRS="${LIB_DIRS}" \ dp_SH="${SH}" \ dp_SCRIPTSDIR="${SCRIPTSDIR}" \ - dp_PORTSDIR="${PORTSDIR}" \ + PORTSDIR="${PORTSDIR}" \ dp_MAKE="${MAKE}" \ ${SH} ${SCRIPTSDIR}/do-depends.sh .endif @@ -4370,7 +4370,7 @@ all-depends-list: # usage. DEPENDS-LIST= \ ${SETENV} \ - dp_PORTSDIR="${PORTSDIR}" \ + PORTSDIR="${PORTSDIR}" \ dp_MAKE="${MAKE}" \ dp_PKGNAME="${PKGNAME}" \ dp_SCRIPTSDIR="${SCRIPTSDIR}" \ |