Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/
Date: Thu, 26 May 2016 10:08:30
Message-Id: 1464257283.fa9a0ed449140fb75b3567f735c1853fd312f7b1.heroxbd@gentoo
1 commit: fa9a0ed449140fb75b3567f735c1853fd312f7b1
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 26 10:06:58 2016 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Thu May 26 10:08:03 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa9a0ed4
7
8 p/p/l-s/profile.bashrc: refactorize with elif.
9
10 profiles/prefix/linux-standalone/profile.bashrc | 12 +++---------
11 1 file changed, 3 insertions(+), 9 deletions(-)
12
13 diff --git a/profiles/prefix/linux-standalone/profile.bashrc b/profiles/prefix/linux-standalone/profile.bashrc
14 index 121ac7b..37635ea 100644
15 --- a/profiles/prefix/linux-standalone/profile.bashrc
16 +++ b/profiles/prefix/linux-standalone/profile.bashrc
17 @@ -22,17 +22,13 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; the
18 sed -i 's/--sysroot=%R//' \
19 gcc/gcc.c || eerror "Please file a bug about this"
20 eend $?
21 -fi
22 -
23 -if [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then
24 +elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then
25 cd "${S}"
26 ebegin "Prefixifying native library path"
27 sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \
28 ld/configure.tgt || eerror "Please file a bug about this"
29 eend $?
30 -fi
31 -
32 -if [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure ]]; then
33 +elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure ]]; then
34 cd "${S}"
35 einfo "Prefixifying hardcoded path"
36
37 @@ -53,9 +49,7 @@ if [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure ]]; th
38 -e "s,/(etc|var),${EPREFIX}/\1,g" \
39 nss/db-Makefile || eerror "Please file a bug about this"
40 eend $?
41 -fi
42 -
43 -if [[ ${CATEGORY}/${PN} == dev-lang/python && ${EBUILD_PHASE} == configure ]]; then
44 +elif [[ ${CATEGORY}/${PN} == dev-lang/python && ${EBUILD_PHASE} == configure ]]; then
45 # Guide h2py to look into glibc of Prefix
46 ebegin "Guide h2py to look into Prefix"
47 export include="${EPREFIX}"/usr/include