[gentoo-commits] dev/heroxbd:master commit in: sys-libs/glibc/, sys-libs/glibc/files/eblits/
commit: 4f1e51c3b49aee3f447dfb10eca2781d8322d783
Author: Benda Xu gentoo org>
AuthorDate: Sun Jun 19 23:22:29 2016 +
Commit: Benda XU gentoo org>
CommitDate: Wed Jun 22 07:44:28 2016 +
URL:https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=4f1e51c3
sys-libs/glibc: sbin in src_configure
sys-libs/glibc/Manifest | 2 +-
sys-libs/glibc/files/eblits/src_configure.eblit | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index c999111..0bcda41 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -35,7 +35,7 @@ AUX eblits/pkg_preinst.eblit 2105 SHA256
aba79a4369067615bc48429ec371ae91ccfc793
AUX eblits/pkg_pretend.eblit 4990 SHA256
219947e495090b640ec6229b028299edc3f06ee81a130211cf91803923ccf477 SHA512
cb27a05b798ec892576239d6146403f2430c9568faad410f42933610c83c60317bcd79198be4ff9b6c08f9e13b3e0ea897a9ddb8613ccc75975fa227e3c9e26d
WHIRLPOOL
613f1920a3d8f51fc6274f73d72cc2be1f3df8b5f2d5af173d050142cbea8b52da4eabe50ba28192af2f2a62c259d512d466b33b303a16648cc82e6422904ba7
AUX eblits/pkg_setup.eblit 275 SHA256
c5de97dc69d3508555ac579e14ead694a75edf4707c1749219677ebee88ca9ab SHA512
627740976e372842b09034b79f61f5cb5d8283f47c94cfe66b2aa1517c901df0bf3b456f1ba26a9ddc0aa0215190d0415ed4f881cc950d163d8203a0e6bba2a9
WHIRLPOOL
16ef3155b35671311443f4c231c1867d12731035aa603dedb6e86eabdc1501c67183474a26bb06048e12c19ac3bda054fdb8a107792a3dddb743b6dc7d447339
AUX eblits/src_compile.eblit 598 SHA256
3b90a6f44d307b92cee36fdd91d412bdb9fcbab555e6c6bf8174c8e3f29137ca SHA512
ee216aa3bb13f75313d141459acb47523442addf12a6bb8d829ca40eda4f63324911a13ff0ae90fe6eed1fbe0058c89308a2205c5357a0e1897a89573fea2f51
WHIRLPOOL
3bfc5406e794ee9ee4005e97aa2d40a82d77de090c72767d6b43be6993048536b4f2442bf6864157d036e7ea3fce6ba6537a97cd2afee04c61f9e98e1adc3c00
-AUX eblits/src_configure.eblit 7863 SHA256
7db19553345321d3999b361e9c76c22ff737cb57a18cc70e7a404c598e91ac38 SHA512
03cf87a1d89b492c1556049a24f846eae73095640a89c843648cf8546c5d84531d5f4714214cce96d00b6d637096f5317b5904da40b5c91df3a2d8bccdbb6a77
WHIRLPOOL
11158e85754842e8c80961f4738cdb4bb6b9cd927d89b79a4e5936cdff652326b803f90954dee38956533c6a9dedaa65aaa816fb8e5ba99c956f59dbe8f73652
+AUX eblits/src_configure.eblit 7909 SHA256
5947f6fe819d936e0e32484a6d3f49ad7aac5e5c89333251c5659fe998c6a083 SHA512
63ef84d95c47d5881db383c4c90be03434e1c1a87db673f562ead7e6edbf694a428cdc0cf69d312159797f70fc5ac74584d7a7087b314d92dc21e452d1d66477
WHIRLPOOL
e5aa3b11ac35b05ea52b077ffe16f8c5fa144a5c70dcf086569a7b6bf2daf171d552dc4a72fee65b892297af1796e80247512e17c313c4c56b6f4b7351fe8ef3
AUX eblits/src_install.eblit 7814 SHA256
8d64a4a031263dd7c3e7ba710a5dbe51fa7004b9795fefdab55f7db273f5e89f SHA512
fb9fc62103e1803509f5910b71eb28398258433762b930c93cccb7578756599739714c41077a2d0fd81c78e8fd14fd30b384a2c141d8df801507414531062551
WHIRLPOOL
4634ef7da02f35d461027a4d5bd27bd4e05de0713b577ac47eb1161048f929e1c52e38fc4ad8da333a2198877b82962416edfb30bbaafb9055fb658a6226
AUX eblits/src_prepare.eblit 2231 SHA256
02e28094bb57137d0f12031dc3ed75d022df711847904f428ffea2e0bc42b778 SHA512
967e831a0390c2fb328cb69a75489f3ecddf2a3aecd3d8b95e8ef36fdced3b0b15a320245cd1274e5bf78bc49a17a862fe4af26f610c3f864418c707e7d6150a
WHIRLPOOL
4855e3979903daa6b4586d5bed08a1f7806c03b9873f4b51a0b6b73254bb40eb08cb0e6329992f663f98907e8d82f485ee7f49ee4f82fd52dbfe880f8dd1fe70
AUX eblits/src_test.eblit 698 SHA256
96b044ef9a27c2591b2a440b45bd89989022d0b41c546ce4dcea58a631315bf4 SHA512
0a46dddf53ccbfaab3f85ba7d2e8f202b4d5be98052601686592eca0ec115de29d8cb1f324ba12dcb77f3a8d4bbb39032532042b8adf809a772ebcc845b1a152
WHIRLPOOL
42af8b97859789b52a5a0c100ba109d8c3dd47532ef3f0b764c95b7a61be9d293d99de25e601dacd840c0a4cc921740b5acc2a3567b5aa3ae8ac6f88430ccf04
diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit
b/sys-libs/glibc/files/eblits/src_configure.eblit
index ba8f925..5f2fec0 100644
--- a/sys-libs/glibc/files/eblits/src_configure.eblit
+++ b/sys-libs/glibc/files/eblits/src_configure.eblit
@@ -127,6 +127,7 @@ glibc_do_configure() {
# There is no configure option for this and we need to export it
# since the glibc build will re-run configure on itself
export libc_cv_slibdir="${EPREFIX}/$(get_libdir)"
+ export libc_cv_rootsbindir="${EPREFIX}/sbin"
# We take care of patching our binutils to use both hash styles,
# and many people like to force gnu hash style only, so disable
[gentoo-commits] dev/heroxbd:master commit in: sys-libs/glibc/, sys-libs/glibc/files/eblits/
commit: 3bed7ef8111b4f6e7da45dbef674bcaee6ce1956
Author: Benda Xu heroxbd AT gentoo DOT org
AuthorDate: Wed Dec 10 10:08:05 2014 +
Commit: Benda XU heroxbd AT gentoo DOT org
CommitDate: Wed Dec 10 10:12:28 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=dev/heroxbd.git;a=commit;h=3bed7ef8
sys-libs/glibc: specify rootsbindir
---
sys-libs/glibc/Manifest | 2 +-
sys-libs/glibc/files/eblits/src_configure.eblit | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 0ea69f5..b7afdde 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -33,7 +33,7 @@ AUX eblits/pkg_postinst.eblit 1085 SHA256
71b7a853cd825ed7044e69c8a76b6ee3e00d46
AUX eblits/pkg_preinst.eblit 2610 SHA256
9e2128b921342534ce8286f5b5d5e3d89435c1d0ef307f67438bdb27862fff25 SHA512
a3b48453670f0f31ffaddfe5d397f2a28a3748840bfcea621ccde6b7a0efec180ef528cf9bf9b99bf523b3c379c978d21d036df621e1726b5ea6f1555c361a92
WHIRLPOOL
b4c4e720579bfb1b13e47aba5fa1bf40b9265432e7ba2ab21decf7f11c9a90dc3b5c0cb283bdbf8f903f27712854c48265cae4e3c926f4b06e6261fb47365170
AUX eblits/pkg_setup.eblit 3963 SHA256
385b1315ef36265375d4a552687437a59cade4dbc937aa99a313002abea63736 SHA512
db970d0bf24182993f10713234316f7a4392859a3d8eff419a2ed7220f4e159daf1b6944888d34bc777587b2e9160a1bd911526fc28512d47aa60ebe3029d4da
WHIRLPOOL
8a00c72f2d81e39de89e43f0eb973315035702357aec986032af7085bc1e5ad02ba2c6341c22f1e967219e239de3e5c714a156117141f875821e116bc78de4cc
AUX eblits/src_compile.eblit 712 SHA256
2f7250659b1ea316dd67a0baa229b9248693b55738416e242bcacbd6efec96b2 SHA512
f812075621013eb9db7748e16997f7785e6029f691147ef63c9c5e4c0ec98ca47cad81a9aa135e69dd57296454d158191deced0cb47201343698d9495b8dd34e
WHIRLPOOL
0692b14ac23a7f995e68c15fc91643bd72707f4072e319460a31014a91fe789794b10ac155021b48f02b9bea636305408ec56bb161664a21ec7f5ff86ccff7fe
-AUX eblits/src_configure.eblit 7338 SHA256
aae83d32044e6ff4091880f2ed2c7a14eda963ea9dce70257eb75609e7758ba4 SHA512
09e643a4f500e819f0061fcce3427fa541161cedccef8cf9acc86da8b7db021b05c974c8fc6d6e7a9b8ef3add4cac1ae0ee972855a31168b30f9b90d0a73e00e
WHIRLPOOL
ba74b1a96c877ef4d17d1c8dc28a443ec82170bdf64b66796a2f26fd401ca643fbc2f35f4dfb7d2bd0cc83e0ec2acb672de832517f909bf550a500f050263bfe
+AUX eblits/src_configure.eblit 7382 SHA256
782eb8eb0e462e0592477e9dfe1660821dceca2c79784047d64a625d05bee200 SHA512
462b7fa883973a4ec31dec43d6977c8551301e00df5267955041f139254f985ad0f8a906ffa048f4a80d2909dea7638e3b09db7ca7327beed01d6b4f9895bbdd
WHIRLPOOL
865639efd635682201f7dac099dd43dd6515091c7d080d753d4a9d562f9c062df2eb900af08ad1e77c35f5bbb62ef96224e905fb09445b8ad7c7de7eb1db3e93
AUX eblits/src_install.eblit 7940 SHA256
e6b3c927b52ccb2afd3a080be482e34481a821f4f4280f426f8b5ddc29db8c30 SHA512
df13584e9fb4d307a7871e2a26347d944d089938f6e5f4c6538a09c23f42b683a4808dc426547af3127787a4b0420459fbdd52f5910ddea45ed1c247fe8b520e
WHIRLPOOL
76ec59abcafc6a530ec7f243ab18dad7176196f60800dc743ba120a8e1503a0ff6159bcfa75e5ba0f5d32c25af07ebfa426a5100d8912b37a9dffd6b5f355c46
AUX eblits/src_prepare.eblit 2344 SHA256
7898682539bc85f126e491bc9c9a727cc5d922680f91dd409aec50c068ca93aa SHA512
30d706f26475db2dfe8cfaaa003c3a21988328ba0cc7cdca439d248c968430308d8d0afefa60302315d4c76011e4de51925307ee19d15eba10e24f1ede2b956f
WHIRLPOOL
3a5ad0de18649805d97b0d78ea33e52608e7b6694ac567313db9e09da18a0bca9b95a027fe0181b50738b5bfe83ac49254d29b077cef36fb311a9707683261b5
AUX eblits/src_test.eblit 808 SHA256
8a652acb87e941fe767ddfbe0e0a42e3b5f208f5408606c5d9de22a85b1f8ebe SHA512
b8a37cd8294f5b6d2735d9971e7bc4bde1a7671540d6f76764d06203f5f179c143c487f57c57747c8e72e7a1d89d05928df51331a44f46d4290e9b89449eed63
WHIRLPOOL
c33b33b71431f3438fbe350c8c1d3c67d17fdccef61687bc645397635875d09af8b4e2b545a4405429c2b8ee4a012fd753205e4b5ce3bb2f93e4341d34a18eb4
diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit
b/sys-libs/glibc/files/eblits/src_configure.eblit
index 608344d..72f39ea 100644
--- a/sys-libs/glibc/files/eblits/src_configure.eblit
+++ b/sys-libs/glibc/files/eblits/src_configure.eblit
@@ -126,6 +126,7 @@ glibc_do_configure() {
# There is no configure option for this and we need to export it
# since the glibc build will re-run configure on itself
export libc_cv_slibdir=${TPREFIX}/$(get_libdir)
+ export libc_cv_rootsbindir=${TPREFIX}/sbin
# We take care of patching our binutils to use both hash styles,
# and many people like to force gnu hash style only, so disable
[gentoo-commits] dev/heroxbd:master commit in: sys-libs/glibc/, sys-libs/glibc/files/eblits/
commit: 4183886acc3a45f9e06f746e25bd6d4a713f589d
Author: Benda Xu heroxbd AT gentoo DOT org
AuthorDate: Sat Dec 6 06:09:22 2014 +
Commit: Benda XU heroxbd AT gentoo DOT org
CommitDate: Sat Dec 6 06:09:22 2014 +
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
}
