[gentoo-commits] gentoo-projects commit in pax-utils: lddtree.sh

[Mike Frysinger (vapier)]

vapier      09/12/01 10:17:05

  Modified:             lddtree.sh
  Log:
  cache rpath/ldso lookups when possible to speed things up

Revision  Changes    Path
1.6                  pax-utils/lddtree.sh

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/lddtree.sh?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/lddtree.sh?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/lddtree.sh?r1=1.5&r2=1.6

Index: lddtree.sh
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/lddtree.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lddtree.sh	1 Dec 2009 10:16:30 -0000	1.5
+++ lddtree.sh	1 Dec 2009 10:17:05 -0000	1.6
@@ -39,8 +39,20 @@
 			done
 			return 1
 		}
-		check_paths "${elf}" $(scanelf -qF '#F%r' "${needed_by}") && return 0
-		check_paths "${elf}" $(sed -e 's:^[[:space:]]*#.*::' /etc/ld.so.conf) && return 0
+		if [[ ${__last_needed_by} != ${needed_by} ]] ; then
+			__last_needed_by=${needed_by}
+			__last_needed_by_rpaths=$(scanelf -qF '#F%r' "${needed_by}" | sed 's|:| |g')
+		fi
+		check_paths "${elf}" ${__last_needed_by_rpaths} && return 0
+		if [[ -z ${__ldso_paths} ]] ; then
+			if [[ -r /etc/ld.so.conf ]] ; then
+				__ldso_paths=$(sed -e 's:^[[:space:]]*#.*::' /etc/ld.so.conf)
+			fi
+			: ${__ldso_paths:= }
+		fi
+		if [[ ${__ldso_paths} != " " ]] ; then
+			check_paths "${elf}" ${__ldso_paths} && return 0
+		fi
 		check_paths "${elf}" /lib* /usr/lib* /usr/local/lib* && return 0
 	fi
 	return 1