| 1 |
commit: 45de8960d86a56bc8417017e925e529088d04ce4 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 2 13:21:17 2016 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 2 13:26:28 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45de8960 |
| 7 |
|
| 8 |
p/p/l-s/profile.bashrc: prefixify shell of make. |
| 9 |
|
| 10 |
profiles/prefix/linux-standalone/profile.bashrc | 19 +++++++++++-------- |
| 11 |
1 file changed, 11 insertions(+), 8 deletions(-) |
| 12 |
|
| 13 |
diff --git a/profiles/prefix/linux-standalone/profile.bashrc b/profiles/prefix/linux-standalone/profile.bashrc |
| 14 |
index fad9d0b..90bfc60 100644 |
| 15 |
--- a/profiles/prefix/linux-standalone/profile.bashrc |
| 16 |
+++ b/profiles/prefix/linux-standalone/profile.bashrc |
| 17 |
@@ -10,8 +10,7 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; the |
| 18 |
einfo "Prefixifying glibc dynamic linker..." |
| 19 |
for h in gcc/config/*/linux*.h; do |
| 20 |
ebegin " Updating $h" |
| 21 |
- sed -i -r "s,(GLIBC_DYNAMIC_LINKER.*\")(/lib),\1${EPREFIX}\2," \ |
| 22 |
- $h || eerror "Please file a bug about this" |
| 23 |
+ sed -i -r "s,(GLIBC_DYNAMIC_LINKER.*\")(/lib),\1${EPREFIX}\2," $h |
| 24 |
eend $? |
| 25 |
done |
| 26 |
|
| 27 |
@@ -19,14 +18,13 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; the |
| 28 |
EXTRA_ECONF="${EXTRA_ECONF} --with-sysroot=${EPREFIX}" |
| 29 |
|
| 30 |
ebegin "remove --sysroot call on ld for native toolchain" |
| 31 |
- sed -i 's/--sysroot=%R//' \ |
| 32 |
- gcc/gcc.c || eerror "Please file a bug about this" |
| 33 |
+ sed -i 's/--sysroot=%R//' gcc/gcc.c |
| 34 |
eend $? |
| 35 |
elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then |
| 36 |
cd "${S}" |
| 37 |
ebegin "Prefixifying native library path" |
| 38 |
sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \ |
| 39 |
- ld/configure.tgt || eerror "Please file a bug about this" |
| 40 |
+ ld/configure.tgt |
| 41 |
eend $? |
| 42 |
elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure ]]; then |
| 43 |
cd "${S}" |
| 44 |
@@ -40,14 +38,13 @@ elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure ]]; |
| 45 |
do |
| 46 |
ebegin " Updating $f" |
| 47 |
sed -i -r \ |
| 48 |
- -e "s,([:\"])/(etc|usr|bin|var),\1${EPREFIX}/\2,g" \ |
| 49 |
- $f || eerror "Please file a bug about this" |
| 50 |
+ -e "s,([:\"])/(etc|usr|bin|var),\1${EPREFIX}/\2,g" $f |
| 51 |
eend $? |
| 52 |
done |
| 53 |
ebegin " Updating nss/db-Makefile" |
| 54 |
sed -i -r \ |
| 55 |
-e "s,/(etc|var),${EPREFIX}/\1,g" \ |
| 56 |
- nss/db-Makefile || eerror "Please file a bug about this" |
| 57 |
+ nss/db-Makefile |
| 58 |
eend $? |
| 59 |
elif [[ ${CATEGORY}/${PN} == dev-lang/python && ${EBUILD_PHASE} == configure ]]; then |
| 60 |
# Guide h2py to look into glibc of Prefix |
| 61 |
@@ -56,4 +53,10 @@ elif [[ ${CATEGORY}/${PN} == dev-lang/python && ${EBUILD_PHASE} == configure ]]; |
| 62 |
sed -i -r \ |
| 63 |
-e "s,/usr/include,\"${EPREFIX}\"/usr/include,g" "${S}"/Lib/plat-linux*/regen |
| 64 |
eend $? |
| 65 |
+elif [[ ${CATEGORY}/${PN} == sys-devel/make && ${EBUILD_PHASE} == prepare ]]; then |
| 66 |
+ cd "${S}" |
| 67 |
+ ebegin "Prefixifying default shell" |
| 68 |
+ sed -i -r \ |
| 69 |
+ -e "/default_shell/s,\"(/bin/sh),\"${EPREFIX}\1," job.c |
| 70 |
+ eend $? |
| 71 |
fi |
Archives