[gentoo-commits] proj/portage:multilib commit in: bin/

[Thomas Sachau]

commit:     1293e045ad66ca676a7e330bce668819c7c2fdf7
Author:     Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 01:03:47 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 17:59:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1293e045

Treat symlinks in /usr/include more carefully by not removing them when diff(1) thinks they are different.

This change recognizes that symlinks can be valid even when they are
pointing to files that are nonexistent. When portage-multilib is
merging /usr/include, the situation of the link targets disappearing
is expected.

This fixes invalid installation of media-libs/openjpeg-1.4-r1 on
portage-multilib.

---
 bin/auto-multilib.sh |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index b268b24..aa65d39 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -337,9 +337,16 @@ _finalize_abi_install() {
 			if use multilib_abi_"${DEFAULT_ABI}" ; then
 				cd "${base}${dir}/gentoo-multilib/${DEFAULT_ABI}" || die
 				for i in $(find . -type l ; find . -type f); do
-					for diffabi in ${ALTERNATE_ABIS}; do
-						diff -q "${i}" ../${diffabi}/"${i}" >/dev/null || files_differ=1
-					done
+					# Ignore symbolic links, they can't be
+					# ABI-ized and diff is confused when the
+					# link's target is removed (by this
+					# loop).
+					if ! [[ -L ${i} ]]; then
+						for diffabi in ${ALTERNATE_ABIS}; do
+							diff -q "${i}" ../${diffabi}/"${i}" >/dev/null || files_differ=1
+						done
+					fi
+
 					if [ -z "${files_differ}" ]; then
 						[ -d "${D}${dir}/${i%/*}" ] || mkdir -p "${D}${dir}/${i%/*}"
 						mv ${base}${dir}/gentoo-multilib/${DEFAULT_ABI}/"${i}" "${D}${dir}/${i}" || die "$DEFAULT_ABI failed"