Gentoo Archives: gentoo-commits

From: "Ned Ludd (solar)" <solar@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-projects commit in crossdev-wrappers/etc/portage: bashrc
Date: Sat, 21 Mar 2009 21:10:30
Message-Id: E1Ll8Sa-0007iF-1v@stork.gentoo.org
1 solar 09/03/21 21:10:28
2
3 Modified: bashrc
4 Log:
5 allow more than one E_MACHINE= type to be defined at the same time for multilib
6
7 Revision Changes Path
8 1.3 crossdev-wrappers/etc/portage/bashrc
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/etc/portage/bashrc?rev=1.3&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/etc/portage/bashrc?rev=1.3&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/etc/portage/bashrc?r1=1.2&r2=1.3
13
14 Index: bashrc
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-projects/crossdev-wrappers/etc/portage/bashrc,v
17 retrieving revision 1.2
18 retrieving revision 1.3
19 diff -u -r1.2 -r1.3
20 --- bashrc 16 Mar 2009 05:53:18 -0000 1.2
21 +++ bashrc 21 Mar 2009 21:10:27 -0000 1.3
22 @@ -1,9 +1,13 @@
23 [[ $(basename $(readlink -f $PORTAGE_CONFIGROOT/etc/make.profile)) == "embedded" ]] && . ${PORTDIR}/profiles/base/profile.bashrc
24 -#echo Add a new aggregation group:x=${x##*/}
25 +
26 post_src_install() {
27 - [[ -d ${D} ]] || return 0
28 + [[ -d ${D} ]] || return 0
29 [[ ${E_MACHINE} == "" ]] && return 0
30 - output="$( cd ${D} && scanelf -RmyBF%a . | grep -v -e ^${E_MACHINE} )"
31 + cmdline=""
32 + for EM in $E_MACHINE; do
33 + cmdline+=" -e ^${EM}[[:space:]]";
34 + done
35 + output="$( cd ${D} && scanelf -RmyBF%a . | grep -v ${cmdline} )"
36 [[ $output != "" ]] && { echo; echo "* Wrong EM_TYPE. Expected ${E_MACHINE}"; echo -e "${output}"; echo; exit 1; }
37 }