diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-12-07 09:51:00 +0800 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-12-07 09:51:00 +0800 |
| commit | 15714bc16469c0021d101f6ec77877d63bdbbf56 (patch) | |
| tree | a42b88a67486f15feef8c1814e679a6ed5e4a0bb /Mk | |
| parent | 0038f24b3097072994e669418f3298bf58aff3bc (diff) | |
| download | freebsd-ports-gnome-15714bc16469c0021d101f6ec77877d63bdbbf56.tar.gz freebsd-ports-gnome-15714bc16469c0021d101f6ec77877d63bdbbf56.tar.zst freebsd-ports-gnome-15714bc16469c0021d101f6ec77877d63bdbbf56.zip | |
Fix 'make -j'.
- Pass MAKEFLAGS down into do-depends properly.
- Remove redundant dependencies, run-depends and lib-depends, from
targets that already depend on earlier targets that depend on
the needed targets.
Reported by: emaste
With hat: portmgr
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Scripts/do-depends.sh | 6 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh index 7ecfabadd443..5469bff33337 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 PORTSDIR dp_MAKE + dp_SCRIPTSDIR PORTSDIR dp_MAKE dp_MAKEFLAGS [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_DO_DEPENDS}" ] && set -x @@ -23,7 +23,7 @@ install_depends() target=$2 depends_args=$3 if [ -z "${dp_USE_PACKAGE_DEPENDS}" -a -z "${dp_USE_PACKAGE_DEPENDS_ONLY}" ]; then - ${dp_MAKE} -C ${origin} -DINSTALLS_DEPENDS ${target} ${depends_args} + MAKEFLAGS="${dp_MAKEFLAGS}" ${dp_MAKE} -C ${origin} -DINSTALLS_DEPENDS ${target} ${depends_args} return 0 fi @@ -46,7 +46,7 @@ install_depends() echo "===> USE_PACKAGE_DEPENDS_ONLY set - not building missing dependency from source" >&2 exit 1 else - ${dp_MAKE} -C ${origin} -DINSTALLS_DEPENDS ${target} ${depends_args} + MAKEFLAGS="${dp_MAKEFLAGS}" ${dp_MAKE} -C ${origin} -DINSTALLS_DEPENDS ${target} ${depends_args} fi } diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 1eb738f9055b..1ecc73966f17 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -4011,6 +4011,7 @@ ${deptype:tl}-depends: dp_SCRIPTSDIR="${SCRIPTSDIR}" \ PORTSDIR="${PORTSDIR}" \ dp_MAKE="${MAKE}" \ + dp_MAKEFLAGS='${.MAKEFLAGS}' \ ${SH} ${SCRIPTSDIR}/do-depends.sh .endif .endfor @@ -5385,7 +5386,7 @@ _STAGE_DEP= build # STAGE is special in its numbering as it has install and stage, so install is # the main, and stage goes after. _STAGE_SEQ= 050:stage-message 100:stage-dir 150:run-depends \ - 151:lib-depends 200:apply-slist 300:pre-install \ + 200:apply-slist 300:pre-install \ 400:generate-plist 450:pre-su-install 475:create-users-groups \ 500:do-install 550:kmod-post-install 600:fixup-lib-pkgconfig 700:post-install \ 750:post-install-script 800:post-stage 850:compress-man \ @@ -5405,7 +5406,7 @@ _TEST_SEQ= 100:test-message 150:test-depends 300:pre-test 500:do-test \ 800:post-test \ ${_OPTIONS_test} ${_USES_test} _INSTALL_DEP= stage -_INSTALL_SEQ= 100:install-message 150:run-depends 151:lib-depends \ +_INSTALL_SEQ= 100:install-message \ 200:check-already-installed _INSTALL_SUSEQ= 300:fake-pkg 500:security-check |