From owner-svn-ports-head@freebsd.org Thu Dec 7 01:51:01 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD12FE95E21; Thu, 7 Dec 2017 01:51:01 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 503BF6EC67; Thu, 7 Dec 2017 01:51:01 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB71p0Ch035901; Thu, 7 Dec 2017 01:51:00 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB71p0b1035899; Thu, 7 Dec 2017 01:51:00 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201712070151.vB71p0b1035899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 7 Dec 2017 01:51:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455690 - in head/Mk: . Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/Mk: . Scripts X-SVN-Commit-Revision: 455690 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2017 01:51:02 -0000 Author: bdrewery Date: Thu Dec 7 01:51:00 2017 New Revision: 455690 URL: https://svnweb.freebsd.org/changeset/ports/455690 Log: 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 Modified: head/Mk/Scripts/do-depends.sh head/Mk/bsd.port.mk Modified: head/Mk/Scripts/do-depends.sh ============================================================================== --- head/Mk/Scripts/do-depends.sh Thu Dec 7 01:49:10 2017 (r455689) +++ head/Mk/Scripts/do-depends.sh Thu Dec 7 01:51:00 2017 (r455690) @@ -11,7 +11,7 @@ validate_env dp_RAWDEPENDS dp_DEPTYPE dp_DEPENDS_TARGE 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 } Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Dec 7 01:49:10 2017 (r455689) +++ head/Mk/bsd.port.mk Thu Dec 7 01:51:00 2017 (r455690) @@ -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- 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