From 57d213778d40e49ee0f88e34028daf56bb579555 Mon Sep 17 00:00:00 2001 From: Benda Xu Date: Fri, 27 May 2016 11:06:06 +0900 Subject: sys-libs/glibc: update eblit patch. --- sys-libs/glibc/Manifest | 6 +++--- sys-libs/glibc/files/eblits/common.eblit | 27 +++++-------------------- sys-libs/glibc/files/eblits/src_configure.eblit | 24 ++++++---------------- sys-libs/glibc/files/eblits/src_install.eblit | 8 ++++---- 4 files changed, 18 insertions(+), 47 deletions(-) diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index ed1aef4..cbab5e9 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -29,14 +29,14 @@ 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 12044 SHA256 fc6d9e2e88549add4561ff66d267ebb4b1841bf740c0c366a1bad29546640617 SHA512 1df934a5809587a0968442ae3846a83bd508d5ff09fd35c06496f5ba5c3371182f98829abdad264ed95a8ddf6a28404be5f5d8b78d269164f4172a03af78f0c4 WHIRLPOOL e9a6485cd3d8cd0f782536879cc02cad9d01fb75a11ac0398dac91a9e4babc809bef2003387615711347b2d567b73fe2760807390696570ba95d02d52e5a28ba +AUX eblits/common.eblit 10946 SHA256 53e1e134c5593371f53cc53a6771e1485a618b187339abf0676d6f8ba6e95bf0 SHA512 28beb9098829fcab119fa8f75e130c49f44e18239142fffdb0f80f8ab28c02e0c1d4b8576a727bb164914ba11b8a61436bf293ddbca7162c33d9b9f7c1415cee WHIRLPOOL e067890647137667acaa00082a6fdb74a0480b746610f5b627f322452759c62415c51a02b491c4b8b6d35a87264f470932d663b27bc537fc1c61bce08cda68fd AUX eblits/pkg_postinst.eblit 971 SHA256 abcb925bb0730d1eae22bbcee7a4ba6523280390f410f38bfdf9eb44e0280000 SHA512 65e577c77a9a488c5e93ccd4afa325ab7e3904df594c13fda17136c8aa2748fa4e6d0102f4799b4ac9b8c3bea9920faadc4db356ece9929ee708bbfa9151dfc2 WHIRLPOOL fb3cdfb702b0ce616064f94321b9225a53b300f76d95495098b6c97eb3ab1650ea2d323eae169bb8d1fd8795134aacb5c54ba6927fe743b01f124aec416b15a0 AUX eblits/pkg_preinst.eblit 2076 SHA256 1d2f3107f463baf916378ea1b6079ef4d03983e1dc01fb7ce551f94c457992b8 SHA512 78fde8ac1338029c7e66ac592044ad797fa7771dfdb8ed21ab681bb3ce5d9778a960b8606cdb7d35f6ace0188d0053dfab29a9e31b1d0051a2f2170c9449d368 WHIRLPOOL 474b8e6883dccd735808bd4f8c0cf42b619c01c2c55a80c2eeff4bdf4716cd706c834bed2a919350fc339f0b8b61c8ba94c342df5736332f32b40ba3155075b6 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 8252 SHA256 0a7dc30cd01127f5c515bf82f4e0329a049a2bbda33d1c0144637c497861810d SHA512 f3d4885e36fba410ce47d6db26289a38beff6aa6de4098cfb80899779218bc976214823ebbad0fd1c2a667aa8e0adf609246629e996f2284b12d834d7f21e497 WHIRLPOOL 40ee39374ec084a91957107b615d4ae7e19f0fe5d273546e30f4d609f70701d6caf351b52a4828ec1c6a8bb54df0dfefc3216d08a4affcfc2b82d57c0e3c4715 -AUX eblits/src_install.eblit 7826 SHA256 1315570d5f1662c75aa0ff0b012d57e54b550f2ef6dc5a78607f163f90821e7c SHA512 83eb3e5817f587f94a7b9aaa91e56ea6c27040c4c4189659899edac8c82d92766804ec86fe9a4bf5de8ad9ce72e78fe7578234d97e3ea47820c2b52ca162df16 WHIRLPOOL dbaebcd7fb8dff629fbe702a116e4096a4e20ec8e763f495e4733fbccd4efbe4454c9ae5a90d82e65fe138734ad00acb13da76ac7f23a7c158645fbfed662a59 +AUX eblits/src_configure.eblit 7863 SHA256 7db19553345321d3999b361e9c76c22ff737cb57a18cc70e7a404c598e91ac38 SHA512 03cf87a1d89b492c1556049a24f846eae73095640a89c843648cf8546c5d84531d5f4714214cce96d00b6d637096f5317b5904da40b5c91df3a2d8bccdbb6a77 WHIRLPOOL 11158e85754842e8c80961f4738cdb4bb6b9cd927d89b79a4e5936cdff652326b803f90954dee38956533c6a9dedaa65aaa816fb8e5ba99c956f59dbe8f73652 +AUX eblits/src_install.eblit 7813 SHA256 f1bd7cc2c46e41a8ea3f321805422209838adb9465ea942b2cc4c185d76463a7 SHA512 27b43f4fe26dfbc054407d9919c9ed42d984c7a10567c1d42f5ad21036c7b3a85a6bd214120775dbfe089d9008143335a98ef6db5913de31824ec194a268129f WHIRLPOOL 5406967fcd4d933ecf964c7ce7a23450c2223089e9098543af7a89f3662ed2105c65efcaa9f9d29afb90f8d7e69c70634ce1540e1b06f3a5fa6de180606207cd AUX eblits/src_prepare.eblit 2231 SHA256 02e28094bb57137d0f12031dc3ed75d022df711847904f428ffea2e0bc42b778 SHA512 967e831a0390c2fb328cb69a75489f3ecddf2a3aecd3d8b95e8ef36fdced3b0b15a320245cd1274e5bf78bc49a17a862fe4af26f610c3f864418c707e7d6150a WHIRLPOOL 4855e3979903daa6b4586d5bed08a1f7806c03b9873f4b51a0b6b73254bb40eb08cb0e6329992f663f98907e8d82f485ee7f49ee4f82fd52dbfe880f8dd1fe70 AUX eblits/src_test.eblit 698 SHA256 96b044ef9a27c2591b2a440b45bd89989022d0b41c546ce4dcea58a631315bf4 SHA512 0a46dddf53ccbfaab3f85ba7d2e8f202b4d5be98052601686592eca0ec115de29d8cb1f324ba12dcb77f3a8d4bbb39032532042b8adf809a772ebcc845b1a152 WHIRLPOOL 42af8b97859789b52a5a0c100ba109d8c3dd47532ef3f0b764c95b7a61be9d293d99de25e601dacd840c0a4cc921740b5acc2a3567b5aa3ae8ac6f88430ccf04 AUX eblits/src_unpack.eblit 3096 SHA256 f0934fe81278797a0625fde2518f5bdf8531c75443ed3dc6ba7d18aa751cb235 SHA512 6fb32f854920ac4c0df5d60d334f4b9376b05d9b2df7d1bfac979acc3d7c282846fcce36c9816558ee75db030c3551b95f2ff26e53ea166adf97a2ae5db55abf WHIRLPOOL cee004cf4967f0b073f56ef5bbc67e56981f109400622f70cfba51ce120115f4c25ee7696a5b9baf7b22080d01d038ea936d5c342d65b7331b3801510a509123 diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit index 66ce76d..8430847 100644 --- a/sys-libs/glibc/files/eblits/common.eblit +++ b/sys-libs/glibc/files/eblits/common.eblit @@ -1,26 +1,9 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 - -: ${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 -# phase PX X P solution -# -------------------+-----------------------------+--------------+---------+----------------------- -# configure_headers EPREFIX/usr/CTARGET/TPREFIX /usr/CTARGET EPREFIX $EPREFIX$(alt_prefix) -# configure_target TPREFIX NULL TPREFIX $TPREFIX -# -------------------+-----------------------------+--------------+---------+----------------------- -# install_root D/ EPREFIX/usr/CTARGET /usr/CTARGET NULL $(alt_prefix root) -# -------------------+-----------------------------+--------------+---------+----------------------- -# ebuild helper ED/ /usr/CTARGET/TPREFIX /usr/CTARGET NULL $(alt_prefix) -alt_prefix() { # $Id$ - if is_crosscompile; then - [[ $1 == root ]] && echo -n ${EPREFIX} - echo -n /usr/${CTARGET} - [[ $1 == root ]] || echo ${TPREFIX} - fi +alt_prefix() { + is_crosscompile && echo /usr/${CTARGET} } if [[ ${EAPI:-0} == [012] ]] ; then @@ -44,9 +27,9 @@ alt_headers() { } alt_build_headers() { if [[ -z ${ALT_BUILD_HEADERS} ]] ; then - ALT_BUILD_HEADERS="${EPREFIX}"$(alt_headers) + ALT_BUILD_HEADERS="${EPREFIX}$(alt_headers)" if tc-is-cross-compiler ; then - ALT_BUILD_HEADERS=${SYSROOT}"${EPREFIX}"$(alt_headers) + ALT_BUILD_HEADERS="${SYSROOT}${EPREFIX}$(alt_headers)" if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then local header_path=$(echo '#include ' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h') ALT_BUILD_HEADERS=${header_path%/linux/version.h} @@ -335,8 +318,8 @@ setup_env() { unset LD_RUN_PATH unset LD_ASSUME_KERNEL + multilib_env ${CTARGET_OPT:-${CTARGET}} if is_crosscompile || tc-is-cross-compiler ; then - multilib_env ${CTARGET_OPT:-${CTARGET}} if ! use multilib ; then MULTILIB_ABIS=${DEFAULT_ABI} else diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit index 5b50a53..ba8f925 100644 --- a/sys-libs/glibc/files/eblits/src_configure.eblit +++ b/sys-libs/glibc/files/eblits/src_configure.eblit @@ -104,14 +104,8 @@ glibc_do_configure() { --host=${CTARGET_OPT:-${CTARGET}} $(use_enable profile) $(use_with gd) - --with-headers="$(alt_build_headers)" - --prefix="${TPREFIX}"/usr - --sysconfdir="${TPREFIX}"/etc - --localstatedir="${TPREFIX}"/var - --libdir="${TPREFIX}"/usr/$(get_libdir) - --mandir="${TPREFIX}"/usr/share/man - --infodir="${TPREFIX}"/usr/share/info - --libexecdir="${TPREFIX}"/usr/$(get_libdir)/misc/glibc + --with-headers=$(alt_build_headers) + --libexecdir="${EPREFIX}/usr/$(get_libdir)/misc/glibc" --with-bugurl=http://bugs.gentoo.org/ --with-pkgversion="$(glibc_banner)" $(use_multiarch || echo --disable-multi-arch) @@ -132,8 +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 + export libc_cv_slibdir="${EPREFIX}/$(get_libdir)" # We take care of patching our binutils to use both hash styles, # and many people like to force gnu hash style only, so disable @@ -150,9 +143,7 @@ glibc_do_configure() { local builddir=$(builddir "$1") mkdir -p "${builddir}" cd "${builddir}" - set -- "${S}"/configure "${myconf[@]}" - echo "$@" - "$@" || die "failed to configure glibc" + ECONF_SOURCE="${S}" econf "${myconf[@]}" # ia64 static cross-compilers are a pita in so much that they # can't produce static ELFs (as the libgcc.a is broken). so @@ -238,8 +229,7 @@ toolchain-glibc_headers_configure() { --enable-bind-now --build=${CBUILD_OPT:-${CBUILD}} --host=${CTARGET_OPT:-${CTARGET}} - --with-headers="$(alt_build_headers)" - --prefix="${TPREFIX}"/usr + --with-headers=$(alt_build_headers) ${EXTRA_ECONF} ) @@ -251,13 +241,11 @@ toolchain-glibc_headers_configure() { # Nothing is compiled here which would affect the headers for the target. # So forcing CC/CFLAGS is sane. - set -- "${S}"/configure "${myconf[@]}" - echo "$@" CC="$(tc-getBUILD_CC)" \ CFLAGS="-O1 -pipe" \ CPPFLAGS="-U_FORTIFY_SOURCE" \ LDFLAGS="" \ - "$@" || die "failed to configure glibc" + ECONF_SOURCE="${S}" econf "${myconf[@]}" } toolchain-glibc_src_configure() { diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit index 7599f63..4a80560 100644 --- a/sys-libs/glibc/files/eblits/src_install.eblit +++ b/sys-libs/glibc/files/eblits/src_install.eblit @@ -6,7 +6,7 @@ toolchain-glibc_src_install() { local builddir=$(builddir $(want_linuxthreads && echo linuxthreads || echo nptl)) cd "${builddir}" - emake install_root="${D}$(alt_prefix root)" install || die + emake install_root="${D}$(alt_prefix)" install || die if want_linuxthreads && want_nptl ; then einfo "Installing NPTL to $(alt_libdir)/tls/..." @@ -102,7 +102,7 @@ toolchain-glibc_src_install() { has ${ldso_abi} $(get_install_abis) || continue ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}" - if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then + if [[ ! -L ${D}/${ldso_name} && ! -e ${D}/${ldso_name} ]] ; then dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name} fi done @@ -111,7 +111,7 @@ toolchain-glibc_src_install() { # binary to be setuid. This is because the default owners/perms will be # exactly what we want. if in_iuse suid && ! use suid ; then - find "${ED}" -name pt_chown -exec chmod -s {} + + find "${D}" -name pt_chown -exec chmod -s {} + fi ################################################################# @@ -202,7 +202,7 @@ toolchain-glibc_src_install() { toolchain-glibc_headers_install() { local builddir=$(builddir "headers") cd "${builddir}" - emake install_root="${D}$(alt_prefix root)" install-headers || die + emake install_root="${D}$(alt_prefix)" install-headers || die if ! version_is_at_least 2.16 ; then insinto $(alt_headers)/bits doins bits/stdio_lim.h || die -- cgit v1.2.3-65-gdbad