Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r14457 - main/branches/prefix/bin
Date: Mon, 28 Sep 2009 20:32:41
Message-Id: E1MsMth-0000gc-V4@stork.gentoo.org
1 Author: grobian
2 Date: 2009-09-28 20:32:37 +0000 (Mon, 28 Sep 2009)
3 New Revision: 14457
4
5 Modified:
6 main/branches/prefix/bin/misc-functions.sh
7 Log:
8 don't run all those expensice ELF checks on Darwin, it has scanelf, but it doesn't have ELF, make bundle check restrictable
9
10 Modified: main/branches/prefix/bin/misc-functions.sh
11 ===================================================================
12 --- main/branches/prefix/bin/misc-functions.sh 2009-09-28 18:31:35 UTC (rev 14456)
13 +++ main/branches/prefix/bin/misc-functions.sh 2009-09-28 20:32:37 UTC (rev 14457)
14 @@ -59,7 +59,7 @@
15 sleep 1
16 done
17
18 - if type -P scanelf > /dev/null && ! hasq binchecks ${RESTRICT}; then
19 + if [[ ${CHOST} != *-darwin* ]] && type -P scanelf > /dev/null && ! hasq binchecks ${RESTRICT}; then
20 local qa_var insecure_rpath=0 tmp_quiet=${PORTAGE_QUIET}
21 local f x
22
23 @@ -520,7 +520,7 @@
24 fi
25 fi
26
27 - if [[ ${CHOST} == *-darwin* ]] ; then
28 + if [[ ${CHOST} == *-darwin* ]] && ! hasq binchecks ${RESTRICT} ; then
29 # on Darwin, dynamic libraries are called .dylibs instead of
30 # .sos. In addition the version component is before the
31 # extension, not after it. Check for this, and *only* warn