diff options
author | Doug Barton <dougb@FreeBSD.org> | 2010-06-12 23:36:52 +0000 |
---|---|---|
committer | Doug Barton <dougb@FreeBSD.org> | 2010-06-12 23:36:52 +0000 |
commit | af0c0b7f621eaa6025b4f0cc71b70a37d061d4a8 (patch) | |
tree | 7bb434a4a8659f94cb50c6527fce476b94e28b0f /ports-mgmt | |
parent | Fix missing fields in previous commit (diff) |
There is no reason for uniquify_list() to reverse the entries,
and doing so can make debugging more difficult.
Add code to post_config() to make sure that things in the
build-only dependency list are not listed as run dependencies for
something already installed.
Apparently, in some circumstances it's necessary to run ldconfig -R
when one moves shared libs from /usr/local/lib to
/usr/local/lib/compat/pkg. So add that to the -w code.
Notes
Notes:
svn path=/head/; revision=256458
Diffstat (limited to 'ports-mgmt')
-rw-r--r-- | ports-mgmt/portmaster/files/portmaster.sh.in | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/ports-mgmt/portmaster/files/portmaster.sh.in b/ports-mgmt/portmaster/files/portmaster.sh.in index d49b2a5e4ca4..d6bafd3dd5e4 100644 --- a/ports-mgmt/portmaster/files/portmaster.sh.in +++ b/ports-mgmt/portmaster/files/portmaster.sh.in @@ -2033,7 +2033,7 @@ uniquify_list () { for item in "$@"; do case "$temp_list" in *" $item "*) ;; - *) temp_list=" $item $temp_list" ;; + *) temp_list=" $temp_list $item " ;; esac done @@ -2314,7 +2314,7 @@ echo " all of the above try adding '-i' to the command line." dep_of_deps=0 if [ -n "$PM_BUILD_ONLY_LIST" ]; then - local var real_rundep deplist dep + local var real_rundep deplist dep temp_bodlg for var in $rundep_list ; do real_rundep=no @@ -2332,6 +2332,13 @@ echo " all of the above try adding '-i' to the command line." eval unset $var ${var}_p done + for dep in $build_only_dl_g; do + grep -q "@comment DEPORIGIN:${dep#$pd/}$" $pdb/*/+CONTENTS || + temp_bodlg="$temp_bodlg $dep" + done + + build_only_dl_g=" `uniquify_list $temp_bodlg` " + unset run_dl_g rundep_list PM_BUILD_ONLY_LIST=pm_bol fi @@ -3281,6 +3288,8 @@ if [ -n "$upg_port" -o -n "$ro_upg_port" ]; then pm_sv Copying old shared libraries for -w $PM_SU_CMD cp -p $temp ${LOCALBASE_COMPAT}/ + pm_sv Running ldconfig + $PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null fi pm_unlink $ldconfig_out ; unset ldconfig_out temp file |