Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 435512 Details for
Bug 473728
sys-libs/glibc Prefix support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
glibc-eblit.patch
g.patch (text/plain), 5.19 KB, created by
Benda Xu
on 2016-05-27 02:55:31 UTC
(
hide
)
Description:
glibc-eblit.patch
Filename:
MIME Type:
Creator:
Benda Xu
Created:
2016-05-27 02:55:31 UTC
Size:
5.19 KB
patch
obsolete
>diff -u eblits.old/common.eblit eblits/common.eblit >--- eblits.old/common.eblit 2016-02-17 22:46:30.879543776 +0900 >+++ eblits/common.eblit 2016-05-27 11:53:52.665475998 +0900 >@@ -27,7 +27,7 @@ > } > alt_build_headers() { > if [[ -z ${ALT_BUILD_HEADERS} ]] ; then >- ALT_BUILD_HEADERS=$(alt_headers) >+ ALT_BUILD_HEADERS="${EPREFIX}$(alt_headers)" > if tc-is-cross-compiler ; then > ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers) > if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then >diff -u eblits.old/pkg_postinst.eblit eblits/pkg_postinst.eblit >--- eblits.old/pkg_postinst.eblit 2015-10-08 10:33:12.825075187 +0900 >+++ eblits/pkg_postinst.eblit 2016-05-27 11:05:30.509567021 +0900 >@@ -6,9 +6,9 @@ > # nothing to do if just installing headers > just_headers && return > >- if ! tc-is-cross-compiler && [[ -x ${ROOT}/usr/sbin/iconvconfig ]] ; then >+ if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then > # Generate fastloading iconv module configuration file. >- "${ROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}" >+ "${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}" > fi > > if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then >@@ -17,10 +17,10 @@ > /sbin/telinit U 2>/dev/null > > # if the host locales.gen contains no entries, we'll install everything >- local locale_list="${ROOT}etc/locale.gen" >+ local locale_list="${EROOT}etc/locale.gen" > if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then > ewarn "Generating all locales; edit /etc/locale.gen to save time/space" >- locale_list="${ROOT}usr/share/i18n/SUPPORTED" >+ locale_list="${EROOT}usr/share/i18n/SUPPORTED" > fi > locale-gen -j $(makeopts_jobs) --config "${locale_list}" > fi >diff -u eblits.old/pkg_preinst.eblit eblits/pkg_preinst.eblit >--- eblits.old/pkg_preinst.eblit 2015-11-20 15:40:21.107460163 +0900 >+++ eblits/pkg_preinst.eblit 2016-05-27 11:05:30.509567021 +0900 >@@ -11,7 +11,7 @@ > glibc_sanity_check() { > cd / #228809 > >- # We enter ${D} so to avoid trouble if the path contains >+ # We enter ${ED} so to avoid trouble if the path contains > # special characters; for instance if the path contains the > # colon character (:), then the linker will try to split it > # and look for the libraries in an unexpected place. This can >@@ -53,7 +53,7 @@ > fi > > [[ ${ROOT} != "/" ]] && return 0 >- [[ -d ${D}/$(get_libdir) ]] || return 0 >+ [[ -d ${ED}/$(get_libdir) ]] || return 0 > glibc_sanity_check > > # For newer EAPIs, this was run in pkg_pretend. >diff -u eblits.old/src_configure.eblit eblits/src_configure.eblit >--- eblits.old/src_configure.eblit 2016-05-26 23:24:25.702886345 +0900 >+++ eblits/src_configure.eblit 2016-05-27 11:43:18.273495895 +0900 >@@ -105,11 +105,7 @@ > $(use_enable profile) > $(use_with gd) > --with-headers=$(alt_build_headers) >- --prefix=/usr >- --libdir=/usr/$(get_libdir) >- --mandir=/usr/share/man >- --infodir=/usr/share/info >- --libexecdir=/usr/$(get_libdir)/misc/glibc >+ --libexecdir="${EPREFIX}/usr/$(get_libdir)/misc/glibc" > --with-bugurl=http://bugs.gentoo.org/ > --with-pkgversion="$(glibc_banner)" > $(use_multiarch || echo --disable-multi-arch) >@@ -130,7 +126,7 @@ > > # 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=/$(get_libdir) >+ 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 >@@ -147,9 +143,7 @@ > 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 >@@ -236,7 +230,6 @@ > --build=${CBUILD_OPT:-${CBUILD}} > --host=${CTARGET_OPT:-${CTARGET}} > --with-headers=$(alt_build_headers) >- --prefix=/usr > ${EXTRA_ECONF} > ) > >@@ -248,13 +241,11 @@ > > # 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 -u eblits.old/src_install.eblit eblits/src_install.eblit >--- eblits.old/src_install.eblit 2015-10-08 10:33:12.825075187 +0900 >+++ eblits/src_install.eblit 2016-05-27 11:43:18.273495895 +0900 >@@ -102,7 +102,7 @@ > has ${ldso_abi} $(get_install_abis) || continue > > ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}" >- if [[ ! -L ${D}/${ldso_name} && ! -e ${D}/${ldso_name} ]] ; then >+ if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then > dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name} > fi > done >@@ -111,7 +111,7 @@ > # 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 "${D}" -name pt_chown -exec chmod -s {} + >+ find "${ED}" -name pt_chown -exec chmod -s {} + > fi > > #################################################################
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 473728
:
351336
|
351386
|
351388
|
351402
|
351436
|
352204
|
390684
|
435510
|
435512
|
436150