| 1 |
commit: 515c7d78d2c1bb3c09903ca23d7de8d957ba4cb9 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 2 23:55:43 2016 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 4 02:25:22 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=515c7d78 |
| 7 |
|
| 8 |
p/p/l-s/profile.bashrc: prefixify perl pwd call. |
| 9 |
|
| 10 |
prefixify python distutils paths. |
| 11 |
|
| 12 |
change glibc prefixify phase to "compile". |
| 13 |
glibc-2.19 is EAPI=0, which does not have a "configure" phase. |
| 14 |
|
| 15 |
prefixify path to /etc/ld.so.conf. |
| 16 |
|
| 17 |
profiles/prefix/linux-standalone/profile.bashrc | 26 ++++++++++++++++--------- |
| 18 |
1 file changed, 17 insertions(+), 9 deletions(-) |
| 19 |
|
| 20 |
diff --git a/profiles/prefix/linux-standalone/profile.bashrc b/profiles/prefix/linux-standalone/profile.bashrc |
| 21 |
index 90bfc60..8399ce6 100644 |
| 22 |
--- a/profiles/prefix/linux-standalone/profile.bashrc |
| 23 |
+++ b/profiles/prefix/linux-standalone/profile.bashrc |
| 24 |
@@ -21,12 +21,14 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; the |
| 25 |
sed -i 's/--sysroot=%R//' gcc/gcc.c |
| 26 |
eend $? |
| 27 |
elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then |
| 28 |
- cd "${S}" |
| 29 |
ebegin "Prefixifying native library path" |
| 30 |
sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \ |
| 31 |
- ld/configure.tgt |
| 32 |
+ "${S}"/ld/configure.tgt |
| 33 |
+ eend $? |
| 34 |
+ ebegin "Prefixifying path to /etc/ld.so.conf" |
| 35 |
+ sed -i -r "s,\"/etc,\"${EPREFIX}/etc," "${S}"/ld/emultempl/elf32.em |
| 36 |
eend $? |
| 37 |
-elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure ]]; then |
| 38 |
+elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == compile ]]; then |
| 39 |
cd "${S}" |
| 40 |
einfo "Prefixifying hardcoded path" |
| 41 |
|
| 42 |
@@ -37,8 +39,7 @@ elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure ]]; |
| 43 |
sysdeps/{{generic,unix/sysv/linux}/paths.h,posix/system.c} |
| 44 |
do |
| 45 |
ebegin " Updating $f" |
| 46 |
- sed -i -r \ |
| 47 |
- -e "s,([:\"])/(etc|usr|bin|var),\1${EPREFIX}/\2,g" $f |
| 48 |
+ sed -i -r "s,([:\"])/(etc|usr|bin|var),\1${EPREFIX}/\2,g" $f |
| 49 |
eend $? |
| 50 |
done |
| 51 |
ebegin " Updating nss/db-Makefile" |
| 52 |
@@ -48,15 +49,22 @@ elif [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure ]]; |
| 53 |
eend $? |
| 54 |
elif [[ ${CATEGORY}/${PN} == dev-lang/python && ${EBUILD_PHASE} == configure ]]; then |
| 55 |
# Guide h2py to look into glibc of Prefix |
| 56 |
- ebegin "Guide h2py to look into Prefix" |
| 57 |
+ ebegin "Guiding h2py to look into Prefix" |
| 58 |
export include="${EPREFIX}"/usr/include |
| 59 |
sed -i -r \ |
| 60 |
-e "s,/usr/include,\"${EPREFIX}\"/usr/include,g" "${S}"/Lib/plat-linux*/regen |
| 61 |
eend $? |
| 62 |
+ ebegin "Prefixifying distutils paths" |
| 63 |
+ sed -re "s,([^[:alnum:]])(/usr[/[:alnum:]]*/(lib[[:alnum:]]*|include)|/lib[[:alnum:]]*),\1${EPREFIX}\2,g" \ |
| 64 |
+ -i "${S}"/setup.py |
| 65 |
+ eend $? |
| 66 |
+elif [[ ${CATEGORY}/${PN} == dev-lang/perl && ${EBUILD_PHASE} == configure ]]; then |
| 67 |
+ ebegin "Prefixifying pwd path" |
| 68 |
+ sed -i -r \ |
| 69 |
+ -e "s,'((|/usr)/bin/pwd),'${EPREFIX}\1," "${S}"/dist/PathTools/Cwd.pm |
| 70 |
+ eend $? |
| 71 |
elif [[ ${CATEGORY}/${PN} == sys-devel/make && ${EBUILD_PHASE} == prepare ]]; then |
| 72 |
- cd "${S}" |
| 73 |
ebegin "Prefixifying default shell" |
| 74 |
- sed -i -r \ |
| 75 |
- -e "/default_shell/s,\"(/bin/sh),\"${EPREFIX}\1," job.c |
| 76 |
+ sed -i -r "/default_shell/s,\"(/bin/sh),\"${EPREFIX}\1," "${S}"/job.c |
| 77 |
eend $? |
| 78 |
fi |
Archives