[gentoo-commits] portage r9275 - main/trunk/bin

[Marius Mauch (genone)]

Author: genone
Date: 2008-02-05 18:57:08 +0000 (Tue, 05 Feb 2008)
New Revision: 9275

Modified:
   main/trunk/bin/misc-functions.sh
Log:
don't record internal providers in NEEDED records as they are pointless for all useful applications in portage and complicate them instead (e.g. bug #205531)

Modified: main/trunk/bin/misc-functions.sh
===================================================================
--- main/trunk/bin/misc-functions.sh	2008-02-05 18:01:06 UTC (rev 9274)
+++ main/trunk/bin/misc-functions.sh	2008-02-05 18:57:08 UTC (rev 9275)
@@ -158,8 +158,27 @@
 			sleep 1
 		fi
 
-		# Save NEEDED information
-		scanelf -qyRF '%p %n' "${D}" | sed -e 's:^:/:' > "${PORTAGE_BUILDDIR}"/build-info/NEEDED
+		# Save NEEDED information after removing self-contained providers
+		scanelf -qyRF '%p:%r %n' "${D}" | sed -e 's:^:/:' | { while read l; do
+			obj=${l%%:*}
+			rpath=${l##*:}; rpath=${rpath%% *}
+			needed=${l##* }
+			if [ -z "${rpath}" -o -n "${rpath//*ORIGIN*}" ]; then
+				# object doesn't contain $ORIGIN in its runpath attribute
+				echo "${obj} ${needed}"	>> "${PORTAGE_BUILDDIR}"/build-info/NEEDED
+			else
+				dir=$(dirname ${obj})
+				# replace $ORIGIN with the dirname of the current object for the lookup
+				opath=$(echo :${rpath}: | sed -e "s#.*:\(.*\)\$ORIGIN\(.*\):.*#\1${dir}\2#")
+				sneeded=$(echo ${needed} | tr , ' ')
+				rneeded=""
+				for lib in ${sneeded}; do
+					[ -e "${D}/${dir}/${lib}" ] || rneeded="${rneeded},${lib}"
+				done
+				rneeded=${rneeded:1}
+				[ -n "${rneeded}" ] && echo "${obj} ${rneeded}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED
+			fi
+		done }
 
 		if [[ ${insecure_rpath} -eq 1 ]] ; then
 			die "Aborting due to serious QA concerns with RUNPATH/RPATH"

-- 
gentoo-commits@l.g.o mailing list