Date: Thu, 14 Jan 2010 21:34:12 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r202307 - user/dougb/portmaster Message-ID: <201001142134.o0ELYCUY052387@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Thu Jan 14 21:34:12 2010 New Revision: 202307 URL: http://svn.freebsd.org/changeset/base/202307 Log: Solve the problem of adding "rundeps of build-only deps" to the build-only list in -t by always doing the augmented list, and only doing things relevant to -t after that's done. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Thu Jan 14 21:30:22 2010 (r202306) +++ user/dougb/portmaster/portmaster Thu Jan 14 21:34:12 2010 (r202307) @@ -1784,31 +1784,27 @@ dependency_check () { fi if [ "$PM_BUILD_ONLY_LIST" = pmp_doing_build_deps ]; then - local rundeps dep run_dl build_only_dl + local rundeps dep varname run_dl build_only_dl rundeps=`pm_make run-depends-list | sort -u` - if [ -z "$RECURSE_THOROUGH" ]; then - for dep in $d_port_list; do - case "$rundeps" in - *${dep}*) -# XXX Need to figure out -t case - varname=`echo ${dep#$pd/} | sed 's#[-+/\.]#_#g'` - rundep_list="$rundep_list $varname" - eval $varname=\"$portdir \$$varname\" - eval ${varname}_p=$dep - eval export $varname ${varname}_p + for dep in $d_port_list; do + case "$rundeps" in + *${dep}*) + varname=`echo ${dep#$pd/} | sed 's#[-+/\.]#_#g'` + rundep_list="$rundep_list $varname" + eval $varname=\"$portdir \$$varname\" + eval ${varname}_p=$dep + eval export $varname ${varname}_p - run_dl="$run_dl $dep" ;; - *) build_only_dl="$build_only_dl $dep" ;; - esac - done + run_dl="$run_dl $dep" ;; + *) build_only_dl="$build_only_dl $dep" ;; + esac + done + if [ -z "$RECURSE_THOROUGH" ]; then d_port_list="$build_only_dl $run_dl" else - for dep in $rundeps; do - run_dl="$run_dl $dep" - done build_only_dl=`pm_make build-depends-list | sort -u` fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001142134.o0ELYCUY052387>