svn commit: r383624 - head/Mk/Scripts

[Baptiste Daroussin]

Author: bapt
Date: Thu Apr  9 06:36:01 2015
New Revision: 383624
URL: https://svnweb.freebsd.org/changeset/ports/383624

Log:
  Stop trying to resolv symlinks when looking up for a shlib
  file -L is resolving them properly and actual-package-depends.sh is also
  correctly resolving them
  
  Exp-run by:	antoine

Modified:
  head/Mk/Scripts/find-lib.sh

Modified: head/Mk/Scripts/find-lib.sh
==============================================================================
--- head/Mk/Scripts/find-lib.sh	Thu Apr  9 05:32:06 2015	(r383623)
+++ head/Mk/Scripts/find-lib.sh	Thu Apr  9 06:36:01 2015	(r383624)
@@ -14,26 +14,6 @@ fi
 lib=$1
 dirs="${LIB_DIRS} `cat ${LOCALBASE}/libdata/ldconfig/* 2>/dev/null || :`"
 
-resolv_symlink() {
-	local file tgt
-	file=${1}
-	if [ ! -L ${file} ] ; then
-		echo ${file}
-		return
-	fi
-
-	tgt=`readlink ${file}`
-	case $tgt in
-	/*)
-		echo $tgt
-		return
-		;;
-	esac
-
-	file=${file%/*}/${tgt}
-	absolute_path ${file}
-}
-
 absolute_path() {
 	local file myifs target
 	file=$1
@@ -55,7 +35,7 @@ absolute_path() {
 
 for libdir in ${dirs} ; do
 	test -f ${libdir}/${lib} || continue
-	libfile=`resolv_symlink ${libdir}/${lib}`
+	libfile=${libdir}/${lib}
 	[ `file -b -L --mime-type ${libfile}` = "application/x-sharedlib" ] || continue
 	echo $libfile
 	break