commit: 45de8960d86a56bc8417017e925e529088d04ce4
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 13:21:17 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 13:26:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45de8960
p/p/l-s/profile.bashrc: prefixify shell of make.
profiles/prefix/linux-standalone/profile.bashrc | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/profiles/prefix/linux-standalone/profile.bashrc
b/profiles/prefix/linux-standalone/profile.bashrc
index fad9d0b..90bfc60 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -10,8 +10,7 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE}
== configure ]]; the
einfo "Prefixifying glibc dynamic linker..."
for h in gcc/config/*/linux*.h; do
ebegin " Updating $h"
- sed -i -r "s,(GLIBC_DYNAMIC_LINKER.*\")(/lib),\1${EPREFIX}\2," \
- $h || eerror "Please file a bug about this"
+ sed -i -r "s,(GLIBC_DYNAMIC_LINKER.*\")(/lib),\1${EPREFIX}\2," $h
eend $?
done
@@ -19,14 +18,13 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE}
== configure ]]; the
EXTRA_ECONF="${EXTRA_ECONF} --with-sysroot=${EPREFIX}"
ebegin "remove --sysroot call on ld for native toolchain"
- sed -i 's/--sysroot=%R//' \
- gcc/gcc.c || eerror "Please file a bug about this"
+ sed -i 's/--sysroot=%R//' gcc/gcc.c
eend $?
elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare
]]; then
cd "${S}"
ebegin "Prefixifying native library path"
sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \
- ld/configure.tgt || eerror "Please file a bug about this"
+ ld/configure.tgt
eend $?
elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure
]]; then
cd "${S}"
@@ -40,14 +38,13 @@ elif [[ ${CATEGORY}/${PN} == sys-libs/glibc &&
${EBUILD_PHASE} == configure ]];
do
ebegin " Updating $f"
sed -i -r \
- -e "s,([:\"])/(etc|usr|bin|var),\1${EPREFIX}/\2,g" \
- $f || eerror "Please file a bug about this"
+ -e "s,([:\"])/(etc|usr|bin|var),\1${EPREFIX}/\2,g" $f
eend $?
done
ebegin " Updating nss/db-Makefile"
sed -i -r \
-e "s,/(etc|var),${EPREFIX}/\1,g" \
- nss/db-Makefile || eerror "Please file a bug about this"
+ nss/db-Makefile
eend $?
elif [[ ${CATEGORY}/${PN} == dev-lang/python && ${EBUILD_PHASE} == configure
]]; then
# Guide h2py to look into glibc of Prefix
@@ -56,4 +53,10 @@ elif [[ ${CATEGORY}/${PN} == dev-lang/python &&
${EBUILD_PHASE} == configure ]];
sed -i -r \
-e "s,/usr/include,\"${EPREFIX}\"/usr/include,g"
"${S}"/Lib/plat-linux*/regen
eend $?
+elif [[ ${CATEGORY}/${PN} == sys-devel/make && ${EBUILD_PHASE} == prepare ]];
then
+ cd "${S}"
+ ebegin "Prefixifying default shell"
+ sed -i -r \
+ -e "/default_shell/s,\"(/bin/sh),\"${EPREFIX}\1," job.c
+ eend $?
fi
