From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RR6FO-00087N-JZ for garchives@archives.gentoo.org; Thu, 17 Nov 2011 17:59:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A6CF21C04E; Thu, 17 Nov 2011 17:59:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CD78321C04E for ; Thu, 17 Nov 2011 17:59:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 44A331B4006 for ; Thu, 17 Nov 2011 17:59:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 71E0880042 for ; Thu, 17 Nov 2011 17:59:29 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1293e045ad66ca676a7e330bce668819c7c2fdf7.tommy@gentoo> Subject: [gentoo-commits] proj/portage:multilib commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/auto-multilib.sh X-VCS-Directories: bin/ X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: 1293e045ad66ca676a7e330bce668819c7c2fdf7 Date: Thu, 17 Nov 2011 17:59:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: beb13afc-7c98-4d22-af0b-e094890e1a64 X-Archives-Hash: e5283a61413cddfd685c17732a76bc2b commit: 1293e045ad66ca676a7e330bce668819c7c2fdf7 Author: Nathan Phillip Brink gentoo org> AuthorDate: Thu Nov 17 01:03:47 2011 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Thu Nov 17 17:59:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D1293e045 Treat symlinks in /usr/include more carefully by not removing them when d= iff(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=3D1 - 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=3D= 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"