[gentoo-commits] dev/heroxbd:master commit in: sys-libs/glibc/, sys-libs/glibc/files/eblits/

[Benda XU]

commit:     4183886acc3a45f9e06f746e25bd6d4a713f589d
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  6 06:09:22 2014 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Dec  6 06:09:22 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=dev/heroxbd.git;a=commit;h=4183886a

sys-libs/glibc: TPREFIX could not be leaked into ebuild environment.
  Default to "" when cross-compiling.

---
 sys-libs/glibc/Manifest                  | 2 +-
 sys-libs/glibc/files/eblits/common.eblit | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index cdd8022..ebaaa48 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -25,7 +25,7 @@ AUX 2.5/glibc-2.5-hardened-pie.patch 1569 SHA256 
ff9cde8857c5da89faa4039e2a81748
 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 SHA256 
1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a SHA512 
360b77df2d19d14060e19e763878297bf042eccd5206ce4829a33c78c982b59b46144116d237a7cac73a22dd6cb4987c8dd50f1d16003baa22c2cb2942d2cbdf
 WHIRLPOOL 
44e14dacdd258c46201a44c2c6aae4d975b960a914c24e49f2b39dae960636512049daa052d3cd8e8d93819d263327c28eac947efdb5d9e240d1bc6e9964016f
 AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 SHA256 
cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf SHA512 
094b24474e42a9714f5298b0768d44f2c0e01b7d8c3b0a754bb16caa6c024106e8c0b1acbce670bacec1ead6653f8365397173d62cb8168b946c8f521ca155d2
 WHIRLPOOL 
9fa16256f9d3bd2f38023549c0bd4c932d3173b6c3f4ef66e19cdb3eff5cb2def6ec02fa72a7e57ba74da6d5f29b82ddb9692d59f6c694d45b5989fa0bfa6057
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 SHA256 
b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3 SHA512 
50563c26e1fd2e71cb034c8a1b85e0e4075ac6467bae46d4cba0c105c940c5aa6531c39cf00c63ebf94be4e290ee485d7bd8239ff08dbc781db605b45c4aa38f
 WHIRLPOOL 
2047148b53073bae4031ad864fc360112e2812115ec455142c82d4694a57387b49b36c98f400dd6f77f5dab3d419303faabe8183a16f0fd68387996c95888a43
-AUX eblits/common.eblit 11811 SHA256 
d5e39c90ba19458a2cc3748f3659f095f80d203a4aaf86d738cbe8ee1835a8db SHA512 
2f7d25e2cc03e6402f41c9cc5462f441bb881c4e6b9a77d25dd0649a6d0f0e7d174bce3a20cbf19e565c11d942b78436e163ac1587b8a77b3e3658d834d8631d
 WHIRLPOOL 
b74ea218554a5e5f762af4b35fe2cb66e0c70a843c622402202c07b9c22fe5d82add9ff41f0cab3c53987a319dc5f689e49bf459a6d8aa6556d036e5d18e2db9
+AUX eblits/common.eblit 11878 SHA256 
8b97d1db83e410b8ae44494e84f44f4072972fb2319d5c52ffe798def5bd848d SHA512 
d4e981279500dc9949516f2ea293287c33c0578b4ed55cf4a87216bee5590102e33b481bcbafc0b0a763b921b6fcf7952563602f7c21d758f6067ed884815fc7
 WHIRLPOOL 
2943eb1f59fc72d9c4c6fbe65464d09de3c649334942aed114d7aa921dfbfaf44f747a91f5b8401d3235ed71df7722ca8e337f80728638d24f054a1a7a944ddf
 AUX eblits/pkg_postinst.eblit 1085 SHA256 
71b7a853cd825ed7044e69c8a76b6ee3e00d46614015960d411941c4d12f5d20 SHA512 
fc39960f370f0a4d5ef4d794f6de14594a53730ec0b3a49956cfddced17196f485337b9cb29759f232ccd33b4e9af7affe92aac93752397aa2e29ff0c1e36809
 WHIRLPOOL 
22936beba3ab465ef32717c1659dffa6ef7094d59d0c8ce2455563d56ce371598deac783f365abe2c55a527e7bdb28d07733ee3ea0858e2df86c65d66d729031
 AUX eblits/pkg_preinst.eblit 2610 SHA256 
9e2128b921342534ce8286f5b5d5e3d89435c1d0ef307f67438bdb27862fff25 SHA512 
a3b48453670f0f31ffaddfe5d397f2a28a3748840bfcea621ccde6b7a0efec180ef528cf9bf9b99bf523b3c379c978d21d036df621e1726b5ea6f1555c361a92
 WHIRLPOOL 
b4c4e720579bfb1b13e47aba5fa1bf40b9265432e7ba2ab21decf7f11c9a90dc3b5c0cb283bdbf8f903f27712854c48265cae4e3c926f4b06e6261fb47365170
 AUX eblits/pkg_setup.eblit 3963 SHA256 
385b1315ef36265375d4a552687437a59cade4dbc937aa99a313002abea63736 SHA512 
db970d0bf24182993f10713234316f7a4392859a3d8eff419a2ed7220f4e159daf1b6944888d34bc777587b2e9160a1bd911526fc28512d47aa60ebe3029d4da
 WHIRLPOOL 
8a00c72f2d81e39de89e43f0eb973315035702357aec986032af7085bc1e5ad02ba2c6341c22f1e967219e239de3e5c714a156117141f875821e116bc78de4cc

diff --git a/sys-libs/glibc/files/eblits/common.eblit 
b/sys-libs/glibc/files/eblits/common.eblit
index 265e605..bb2ef63 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 
1.45 2014/10/18 23:09:51 vapier Exp $
 
-: ${TPREFIX:=${EPREFIX}}
+: ${TPREFIX:=$(is_crosscompile && echo "" || echo ${EPREFIX})}
 
 # ROOT variable is not used in src_*; emulate that with $(alt_prefix root).
 # P:=Prefix X:=Cross-Triplet PX: Cross-Triplet-Prefix
@@ -16,7 +16,8 @@
 #  ebuild helper ED/   /usr/CTARGET/TPREFIX          /usr/CTARGET   NULL      
$(alt_prefix)         
 alt_prefix() {
        if is_crosscompile; then
-               echo -n "${EPREFIX}"/usr/${CTARGET}
+               [[ $1 == root ]] && echo -n ${EPREFIX}
+               echo -n /usr/${CTARGET}
                [[ $1 == root ]] || echo ${TPREFIX}
        fi
 }