--- trunk/mage/usr/lib/mage/autodepend.sh 2012/01/13 18:45:35 1644 +++ trunk/mage/usr/lib/mage/autodepend.sh 2012/10/12 13:02:10 1954 @@ -1,6 +1,6 @@ #!/bin/bash -SCANELF="scanelf -nyRB" +SCANELF="scanelf -LnyRB" BINDIR="$1" if [[ -z ${BINDIR} ]] @@ -25,10 +25,17 @@ local soname local deps local i + local prefix + + # if /lib /lib64 are symlinks than add a prefix to honor usr-move + if [[ -L /lib ]] || [[ -L /lib64 ]] + then + prefix="/usr" + fi for soname in ${SONAME_LIST} do - deps+=" $(magequery -f ${soname})" + deps+=" $(magequery -e ${soname})" done DEPNAME_LIST="$(for i in ${deps}; do echo ${i}; done | sort -u)" export DEPNAME_LIST @@ -38,4 +45,4 @@ build_dep_list #echo "${SONAME_LIST}" -echo "${DEPNAME_LIST}" | sed 's:\(.*\)-r.*:>= \1:' +echo "${DEPNAME_LIST}" | sed 's:\(.*\)-r.*:>= \1:'