Date: Sat, 1 Jan 2011 06:54:22 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r216867 - user/dougb/portmaster Message-ID: <201101010654.p016sMCK002076@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Sat Jan 1 06:54:21 2011 New Revision: 216867 URL: http://svn.freebsd.org/changeset/base/216867 Log: If PM_PACKAGES is set, don't bother with build depends Reminded by: ale Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Jan 1 01:31:45 2011 (r216866) +++ user/dougb/portmaster/portmaster Sat Jan 1 06:54:21 2011 (r216867) @@ -3113,10 +3113,15 @@ if [ -n "$PM_FIRST_PASS" ]; then [ "$$" -eq "$PM_PARENT_PID" -a -n "$PM_BUILD_ONLY_LIST" ] && PM_BUILD_ONLY_LIST=pmp_doing_build_deps - [ -z "$PM_PACKAGES" -a -z "$PM_NO_MAKE_CONFIG" ] && make_config + if [ -z "$PM_PACKAGES" ]; then + [ -z "$PM_NO_MAKE_CONFIG" ] && make_config + + dep_check_type='build-depends-list run-depends-list' + [ -n "$RECURSE_THOROUGH" ] && dep_check_type=all-depends-list + else + dep_check_type=run-depends-list + fi - dep_check_type='build-depends-list run-depends-list' - [ -n "$RECURSE_THOROUGH" ] && dep_check_type=all-depends-list dependency_check "$dep_check_type" [ -n "$UPDATE_REQ_BYS" -o -n "$URB_YES" ] && @@ -3199,7 +3204,12 @@ if [ -z "$NO_DEP_UPDATES" ]; then fi else echo "===>>> Starting check for all dependencies" - dependency_check all-depends-list + + if [ -z "$PM_PACKAGES" ]; then + dependency_check all-depends-list + else + dependency_check run-depends-list + fi fi pm_cd_pd $portdir elif [ "$$" -eq "$PM_PARENT_PID" ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101010654.p016sMCK002076>