[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/linux-standalone/

[Benda XU]

commit:     d06378978a7f3769901b7fa33bb92c81f76956a1
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  7 02:35:34 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jun  7 02:36:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0637897

profiles/prefix/linux-standalone: remove perl android logics.

 profiles/prefix/linux-standalone/profile.bashrc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/profiles/prefix/linux-standalone/profile.bashrc 
b/profiles/prefix/linux-standalone/profile.bashrc
index 8399ce6..2b0e3b1 100644
--- a/profiles/prefix/linux-standalone/profile.bashrc
+++ b/profiles/prefix/linux-standalone/profile.bashrc
@@ -60,8 +60,13 @@ elif [[ ${CATEGORY}/${PN} == dev-lang/python && 
${EBUILD_PHASE} == configure ]];
     eend $?
 elif [[ ${CATEGORY}/${PN} == dev-lang/perl && ${EBUILD_PHASE} == configure ]]; 
then
     ebegin "Prefixifying pwd path"
-    sed -i -r \
-       -e "s,'((|/usr)/bin/pwd),'${EPREFIX}\1," "${S}"/dist/PathTools/Cwd.pm
+    sed -r "s,'((|/usr)/bin/pwd),'${EPREFIX}\1," -i 
"${S}"/dist/PathTools/Cwd.pm
+    eend $?
+
+    # Configure checks for /system/lib/libandroid.so to override linux into 
linux-android,
+    # which is not desired for Gentoo
+    ebegin "Removing Android detection"
+    sed "/libandroid.so/d" -i "${S}"/Configure
     eend $?
 elif [[ ${CATEGORY}/${PN} == sys-devel/make && ${EBUILD_PHASE} == prepare ]]; 
then
     ebegin "Prefixifying default shell"