From: "Thomas Sachau" <tommy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:multilib commit in: bin/
Date: Thu, 17 Nov 2011 17:59:29 +0000 (UTC) [thread overview]
Message-ID: <1293e045ad66ca676a7e330bce668819c7c2fdf7.tommy@gentoo> (raw)
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"
next reply other threads:[~2011-11-17 17:59 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-17 17:59 Thomas Sachau [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-30 9:33 [gentoo-commits] proj/portage:multilib commit in: bin/ Thomas Sachau
2021-07-25 11:42 Thomas Sachau
2021-01-23 9:52 Thomas Sachau
2021-01-15 17:16 Thomas Sachau
2021-01-15 16:20 Thomas Sachau
2019-12-26 12:37 Thomas Sachau
2018-09-01 11:03 Thomas Sachau
2018-04-14 12:32 Thomas Sachau
2018-03-03 15:18 Thomas Sachau
2018-01-07 9:30 Thomas Sachau
2018-01-07 9:30 Thomas Sachau
2016-02-28 12:57 Thomas Sachau
2015-05-05 13:22 Thomas Sachau
2015-05-05 12:05 Thomas Sachau
2015-05-05 12:05 Thomas Sachau
2013-09-17 13:02 Thomas Sachau
2013-03-03 13:44 Thomas Sachau
2013-02-27 19:44 Thomas Sachau
2012-12-20 20:38 Thomas Sachau
2012-09-24 20:42 Thomas Sachau
2012-09-22 15:30 Thomas Sachau
2012-07-08 10:03 Thomas Sachau
2012-07-02 5:22 Zac Medico
2012-07-01 11:58 Thomas Sachau
2012-03-25 17:38 Thomas Sachau
2012-03-18 15:25 Thomas Sachau
2012-03-16 21:23 Thomas Sachau
2012-03-16 19:37 Thomas Sachau
2012-03-16 19:26 Thomas Sachau
2012-03-16 19:23 Thomas Sachau
2012-02-26 16:27 Thomas Sachau
2012-02-26 16:27 Thomas Sachau
2012-02-26 16:27 Thomas Sachau
2011-11-14 21:11 Thomas Sachau
2011-11-14 21:07 Thomas Sachau
2011-11-14 21:05 Thomas Sachau
2011-11-14 20:58 Thomas Sachau
2011-10-31 19:50 Thomas Sachau
2011-10-03 12:40 Thomas Sachau
2011-10-03 12:34 Thomas Sachau
2011-10-02 14:00 Thomas Sachau
2011-09-09 13:16 Thomas Sachau
2011-07-15 13:43 Thomas Sachau
2011-07-15 13:33 Thomas Sachau
2011-07-05 17:34 Thomas Sachau
2011-03-03 19:53 Thomas Sachau
2011-02-06 13:09 Thomas Sachau
2011-02-06 13:09 Thomas Sachau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1293e045ad66ca676a7e330bce668819c7c2fdf7.tommy@gentoo \
--to=tommy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox