From efbf4d947178c5ec85704b05d31618115424c960 Mon Sep 17 00:00:00 2001 From: Mark Loeser Date: Tue, 3 Jan 2006 06:00:34 +0000 Subject: Bump to add a new patchset which fixes MIPs gcc-4 issues, bug #32429 and #116086 Package-Manager: portage-2.1_pre3-r1 --- sys-libs/glibc/ChangeLog | 10 +- sys-libs/glibc/Manifest | 14 +- sys-libs/glibc/files/digest-glibc-2.3.6-r2 | 7 + sys-libs/glibc/glibc-2.3.6-r2.ebuild | 1358 ++++++++++++++++++++++++++++ 4 files changed, 1386 insertions(+), 3 deletions(-) create mode 100644 sys-libs/glibc/files/digest-glibc-2.3.6-r2 create mode 100644 sys-libs/glibc/glibc-2.3.6-r2.ebuild (limited to 'sys-libs') diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 048012474eb3..52557d32f5e3 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/glibc -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.416 2005/12/25 00:57:06 kumba Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.417 2006/01/03 06:00:33 halcy0n Exp $ + +*glibc-2.3.6-r2 (03 Jan 2006) + + 03 Jan 2006; Mark Loeser +glibc-2.3.6-r2.ebuild: + Bump to add a new patchset which fixes MIPs gcc-4 issues, bug #32429 and + #116086 25 Dec 2005; Joshua Kinard glibc-2.3.6-r1.ebuild: New patchset to fix mips build issues when using gcc-4.x. diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 0191502c896c..f307fedf5abe 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,4 +1,7 @@ -MD5 a6b5a8163d99999dfa53b7cc665afc1d ChangeLog 87383 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 4bc44dfb839bd2e2368e66f4a9685f54 ChangeLog 87574 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433 MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053 @@ -108,6 +111,7 @@ MD5 7a909f8df7cc20f37fb7553c8dcb47b4 files/digest-glibc-2.3.5.20050421 604 MD5 e8833674518301b1dc7798d5f856aad4 files/digest-glibc-2.3.5.20050722 604 MD5 ad9e56a2eed9290c3dbf504897220dce files/digest-glibc-2.3.6 517 MD5 15dbb1ab3cff425b75d116a0202cf34a files/digest-glibc-2.3.6-r1 517 +MD5 dceca9a720556f97d4c0576f08b379d1 files/digest-glibc-2.3.6-r2 517 MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376 MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320 MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610 @@ -135,5 +139,13 @@ MD5 702c30c61eb97343e09dfde1033342b6 glibc-2.3.5.20050421.ebuild 40128 MD5 7b8266a1773efaae98829ae076e68fe4 glibc-2.3.5.20050722.ebuild 39275 MD5 23af2c26bf05b7b899e05875ebc22af5 glibc-2.3.5.ebuild 40252 MD5 22fd599468cdef40f494d009951d0469 glibc-2.3.6-r1.ebuild 41910 +MD5 49c5af9a3084311275b14d6c1f9b61a4 glibc-2.3.6-r2.ebuild 41912 MD5 1690299a3906d44c52895a8739e0126d glibc-2.3.6.ebuild 40195 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDuhMUCRZPokWLroQRAtNRAJ9ZFgzxms8V8j91G99jz/TCEa2KWQCfezCt +PF25olL5/A3dloCwT7MVshw= +=zHjJ +-----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/files/digest-glibc-2.3.6-r2 b/sys-libs/glibc/files/digest-glibc-2.3.6-r2 new file mode 100644 index 000000000000..e1fac14a05a7 --- /dev/null +++ b/sys-libs/glibc/files/digest-glibc-2.3.6-r2 @@ -0,0 +1,7 @@ +MD5 8d717d2071a5c3dbde4ecf8c397d617c glibc-2.3.6-patches-1.4.tar.bz2 32540 +MD5 bfdce99f82d6dbcb64b7f11c05d6bc96 glibc-2.3.6.tar.bz2 14014977 +MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998 +MD5 1c7fa36de8bdb130e4b697d25cc672cd glibc-infopages-2.3.6.tar.bz2 1298413 +MD5 49dbe06ce830fc73874d6b38bdc5b4db glibc-libidn-2.3.6.tar.bz2 101041 +MD5 d4eeda37472666a15cc1f407e9c987a9 glibc-linuxthreads-2.3.6.tar.bz2 243534 +MD5 0b5f8f3e19c4c4efd1ab15a3823c4538 glibc-manpages-2.3.6-1.tar.bz2 22216 diff --git a/sys-libs/glibc/glibc-2.3.6-r2.ebuild b/sys-libs/glibc/glibc-2.3.6-r2.ebuild new file mode 100644 index 000000000000..a287d468e564 --- /dev/null +++ b/sys-libs/glibc/glibc-2.3.6-r2.ebuild @@ -0,0 +1,1358 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r2.ebuild,v 1.1 2006/01/03 06:00:34 halcy0n Exp $ + +# Here's how the cross-compile logic breaks down ... +# CTARGET - machine that will target the binaries +# CHOST - machine that will host the binaries +# CBUILD - machine that will build the binaries +# If CTARGET != CHOST, it means you want a libc for cross-compiling. +# If CHOST != CBUILD, it means you want to cross-compile the libc. +# CBUILD = CHOST = CTARGET - native build/install +# CBUILD != (CHOST = CTARGET) - cross-compile a native build +# (CBUILD = CHOST) != CTARGET - libc for cross-compiler +# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler +# For install paths: +# CHOST = CTARGET - install into / +# CHOST != CTARGET - install into /usr/CTARGET/ + +#KEYWORDS="~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="-* ~mips ~ppc" + +BRANCH_UPDATE="" + +# From linuxthreads/man +GLIBC_MANPAGE_VERSION="2.3.6-1" + +# From manual +GLIBC_INFOPAGE_VERSION="2.3.6" + +# Gentoo patchset +PATCH_VER="1.4" + +# C Stubbs addon (contained in fedora, so ignoring) +#CSTUBS_VER="2.1.2" +#CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2" +#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}" + +# Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm) +FEDORA_VER="20041219T2331" +FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2" +FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}" + +GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo" +GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc" + +### PUNT OUT TO ECLASS?? ### +inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib + +DESCRIPTION="GNU libc6 (also called glibc2) C library" +HOMEPAGE="http://www.gnu.org/software/libc/libc.html" +LICENSE="LGPL-2" + +IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp linuxthreads-tls profile" + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET=${CATEGORY/cross-} + fi +fi +if [[ ${CTARGET} == ${CHOST} ]] ; then + PROVIDE="virtual/libc" +fi + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} +just_headers() { + [[ -z ${_E_CROSS_HEADERS_ONLY} ]] && return 1 + is_crosscompile +} + +GLIBC_RELEASE_VER=$(get_version_component_range 1-3) + +# Don't set this to :-, - allows BRANCH_UPDATE="" +BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)} + +# (Recent snapshots fails with 2.6.5 and earlier with NPTL) +NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.6"} +LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"} + +### SRC_URI ### + +# This function handles the basics of setting the SRC_URI for a glibc ebuild. +# To use, set SRC_URI with: +# +# SRC_URI="$(get_glibc_src_uri)" +# +# Other than the variables normally set by portage, this function's behavior +# can be altered by setting the following: +# +# GENTOO_TOOLCHAIN_BASE_URI +# This sets the base URI for all gentoo-specific patch files. Note +# that this variable is only important for a brief period of time, +# before your source files get picked up by mirrors. However, it is +# still highly suggested that you keep files in this location +# available. +# +# BRANCH_UPDATE +# If set, this variable signals that we should be using the main +# release tarball (determined by ebuild version) and applying a +# CVS branch update patch against it. The location of this branch +# update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}. +# Just like with SNAPSHOT, this variable is ignored if the ebuild +# has a _pre suffix. +# +# PATCH_VER +# PATCH_GLIBC_VER +# This should be set to the version of the gentoo patch tarball. +# The resulting filename of this tarball will be: +# glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 +# +# GLIBC_MANPAGE_VERSION +# GLIBC_INFOPAGE_VERSION +# The version of glibc for which we will download pages. This will +# default to ${GLIBC_RELEASE_VER}, but we may not want to pre-generate man pages +# for prerelease test ebuilds for example. This allows you to +# continue using pre-generated manpages from the last stable release. +# If set to "none", this will prevent the downloading of manpages, +# which is useful for individual library targets. +# +get_glibc_src_uri() { + GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-"mirror://gentoo"} + +# GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2 +# http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 +# http://ftp.gnu.org/gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2 + GLIBC_SRC_URI="mirror://gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2 + mirror://gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 + mirror://gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2" + + if [[ -n ${BRANCH_UPDATE} ]] ; then + GLIBC_SRC_URI="${GLIBC_SRC_URI} + ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" + [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && + GLIBC_SRC_URI="${GLIBC_SRC_URI} + ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" + fi + + if [[ -n ${PATCH_VER} ]] ; then + GLIBC_SRC_URI="${GLIBC_SRC_URI} + ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2" + [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && + GLIBC_SRC_URI="${GLIBC_SRC_URI} + ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2" + fi + + if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then + GLIBC_SRC_URI="${GLIBC_SRC_URI} + ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" + [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && + GLIBC_SRC_URI="${GLIBC_SRC_URI} + ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" + fi + + if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then + GLIBC_SRC_URI="${GLIBC_SRC_URI} + ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" + [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && + GLIBC_SRC_URI="${GLIBC_SRC_URI} + ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" + fi + + if [[ -n ${CSTUBS_URI} ]] ; then + GLIBC_SRC_URI="${GLIBC_SRC_URI} ${CSTUBS_URI}" + fi + + if [[ -n ${FEDORA_URI} ]] ; then + GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}" + fi + + echo "${GLIBC_SRC_URI}" +} + +SRC_URI=$(get_glibc_src_uri) +S=${WORKDIR}/glibc-${GLIBC_RELEASE_VER} + +### EXPORTED FUNCTIONS ### +toolchain-glibc_src_unpack() { + # Check NPTL support _before_ we unpack things to save some time + want_nptl && check_nptl_support + + unpack glibc-${GLIBC_RELEASE_VER}.tar.bz2 + + cd "${S}" + unpack glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 + unpack glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2 + + [[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL} + [[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL} + + if [[ -n ${PATCH_VER} ]] ; then + cd "${WORKDIR}" + unpack glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 + fi + + # XXX: We should do the branchupdate, before extracting the manpages and + # infopages else it does not help much (mtimes change if there is a change + # to them with branchupdate) + if [[ -n ${BRANCH_UPDATE} ]] ; then + cd "${S}" + epatch "${DISTDIR}"/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 + + # Snapshot date patch + einfo "Patching version to display snapshot date ..." + sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h + fi + + if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then + cd "${WORKDIR}" + unpack glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 + fi + + if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then + cd "${S}" + unpack glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 + fi + + if [[ -n ${PATCH_VER} ]] ; then + cd "${S}" + EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER} ..." \ + EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \ + EPATCH_SUFFIX="patch" \ + ARCH=$(tc-arch) \ + epatch "${WORKDIR}"/patches + fi +} + +toolchain-glibc_src_compile() { + # Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs + local MAKEFLAGS="" + has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv" + + echo + for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do + einfo " $(printf '%15s' ${v}:) ${!v}" + done + echo + + if want_linuxthreads ; then + glibc_do_configure linuxthreads + einfo "Building GLIBC with linuxthreads..." + make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die + fi + if want_nptl ; then + # ... and then do the optional nptl build + unset LD_ASSUME_KERNEL + glibc_do_configure nptl + einfo "Building GLIBC with NPTL..." + make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die + fi +} + +toolchain-glibc_headers_compile() { + GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers + mkdir -p "${GBUILDDIR}" + cd "${GBUILDDIR}" + + # Pick out the correct location for build headers + local headersloc=$(alt_headers) + tc-is-cross-compiler && headersloc=${ROOT}${headersloc} + local myconf="--disable-sanity-checks --enable-hacker-mode" + myconf="${myconf} + --enable-add-ons=linuxthreads + --without-cvs + --enable-bind-now + --build=${CBUILD_OPT:-${CBUILD}} + --host=${CTARGET_OPT:-${CTARGET}} + --with-headers=${headersloc} + --prefix=$(alt_prefix) + --mandir=$(alt_prefix)/share/man + --infodir=$(alt_prefix)/share/info + --libexecdir=$(alt_prefix)/lib/misc/glibc + ${EXTRA_ECONF}" + + einfo "Configuring GLIBC headers with: ${myconf// /\n\t\t}" + CC=gcc \ + CFLAGS="-O1 -pipe" \ + ${S}/configure ${myconf} || die "failed to configure glibc" +} + +toolchain-glibc_src_test() { + # This is wrong, but glibc's tests fail bad when screwing + # around with sandbox, so lets just punt it + unset LD_PRELOAD + + # do the linuxthreads build unless we're using nptlonly + if want_linuxthreads ; then + cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads + einfo "Checking GLIBC with linuxthreads..." + make check || die "linuxthreads glibc did not pass make check" + fi + if want_nptl ; then + cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl + unset LD_ASSUME_KERNEL || : + einfo "Checking GLIBC with NPTL..." + make check || die "nptl glibc did not pass make check" + fi +} + +toolchain-glibc_pkg_preinst() { + # PPC64+others may want to eventually be added to this logic if they + # decide to be multilib compatible and FHS compliant. note that this + # chunk of FHS compliance only applies to 64bit archs where 32bit + # compatibility is a major concern (not IA64, for example). + + # amd64's 2005.0 is the first amd64 profile to not need this code. + # 2005.0 is setup properly, and this is executed as part of the + # 2004.3 -> 2005.0 upgrade script. + # It can be removed after 2004.3 has been purged from portage. + { use amd64 || use ppc64; } && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks + + # it appears that /lib/tls is sometimes not removed. See bug + # 69258 for more info. + if [[ -d ${ROOT}/$(alt_libdir)/tls ]] && ! { want_nptl && want_linuxthreads; }; then + addwrite "${ROOT}"/$(alt_libdir)/ + ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..." + rm -r "${ROOT}"/$(alt_libdir)/tls || die + fi + + # Shouldnt need to keep this updated + [[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build +} + +toolchain-glibc_src_install() { + # Need to dodir first because it might not exist (bad amd64 profiles) + dodir $(alt_usrlibdir) + + # These should not be set, else the + # zoneinfo do not always get installed ... + unset LANGUAGE LANG LC_ALL + + if want_linuxthreads ; then + cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads + einfo "Installing GLIBC ${ABI} with linuxthreads ..." + make PARALLELMFLAGS="${MAKEOPTS} -j1" \ + install_root="${D}" \ + install || die + else # nptlonly + cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl + einfo "Installing GLIBC ${ABI} with NPTL ..." + make PARALLELMFLAGS="${MAKEOPTS} -j1" \ + install_root="${D}" \ + install || die + fi + + if is_crosscompile ; then + # punt all the junk not needed by a cross-compiler + rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/{gconv,misc},sbin,share} + else + # zoneinfo stuff is now provided by the timezone-data package + rm -rf "${D}"/usr/share/zoneinfo + rm -f "${D}"/usr/bin/tzselect + rm -f "${D}"/usr/sbin/{zic,zdump} + fi + + if want_linuxthreads && want_nptl ; then + einfo "Installing NPTL to $(alt_libdir)/tls/..." + cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl + mkdir -p "${D}"$(alt_libdir)/tls/ + + libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so) + cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die + dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*) + + libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so) + pushd math > /dev/null + cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die + dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*) + popd > /dev/null + + librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so) + pushd rt > /dev/null + cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die + dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*) + popd > /dev/null + + libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so) + pushd nptl_db > /dev/null + cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die + dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*) + popd > /dev/null + + libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so + cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die + dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0 + + # and now for the static libs + mkdir -p "${D}"$(alt_usrlibdir)/nptl + cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \ + "${D}"$(alt_usrlibdir)/nptl + + # linker script crap + for lib in libc libpthread; do + sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \ + -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \ + "${D}"$(alt_usrlibdir)/${lib}.so \ + > "${D}"$(alt_usrlibdir)/nptl/${lib}.so + + chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so + done + + dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so + + # last but not least... headers. + mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl + make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1" + pushd "${D}"/nptl/$(alt_headers) > /dev/null + for i in $(find . -type f) ; do + if ! [[ -f ${D}$(alt_headers)/$i ]] \ + || ! cmp -s $i ${D}$(alt_headers)/$i; then + mkdir -p ${D}$(alt_headers)/nptl/`dirname $i` + cp -a $i ${D}$(alt_headers)/nptl/$i + fi + done + popd > /dev/null + rm -rf ${D}/nptl + fi + + # Now, strip everything but the thread libs #46186, as well as the dynamic + # linker, else we cannot set breakpoints in shared libraries. + # Fix for ld-* by Lonnie Princehouse. + mkdir -p ${T}/thread-backup + for x in ${D}$(alt_libdir)/lib{pthread,thread_db}* \ + ${D}$(alt_libdir)/ld-* ; do + [[ -f ${x} ]] && mv -f ${x} ${T}/thread-backup/ + done + if want_linuxthreads && want_nptl ; then + mkdir -p ${T}/thread-backup/tls + for x in ${D}$(alt_libdir)/tls/lib{pthread,thread_db}* ; do + [[ -f ${x} ]] && mv -f ${x} ${T}/thread-backup/tls + done + fi + env -uRESTRICT CHOST=${CTARGET} prepallstrip + cp -a -- ${T}/thread-backup/* ${D}$(alt_libdir)/ || die + + if use pic && [[ $(tc-arch) != "amd64" ]] ; then + find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}$(alt_libdir)/soinit.o \; + find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}$(alt_libdir)/sofini.o \; + find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}$(alt_libdir) \; + find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}$(alt_libdir) \; + + for i in ${D}$(alt_libdir)/*.map; do + mv ${i} ${i%.map}_pic.map + done + fi + + # We'll take care of the cache ourselves + rm -f ${D}/etc/ld.so.cache + + # Some things want this, notably ash. + dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a + + # Handle includes for different ABIs + prep_ml_includes $(alt_headers) + + ################################################################# + # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY # + # Make sure we install the sys-include symlink so that when + # we build a 2nd stage cross-compiler, gcc finds the target + # system headers correctly. See gcc/doc/gccinstall.info + if is_crosscompile ; then + dosym include $(alt_prefix)/sys-include + dosym . $(alt_prefix)/usr + return 0 + fi + + # Everything past this point just needs to be done once... don't waste time building locale files twice... + is_final_abi || return 0 + + if want_linuxthreads ; then + MYMAINBUILDDIR=build-${ABI}-${CTARGET}-linuxthreads + else + MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl + fi + cd "${WORKDIR}"/${MYMAINBUILDDIR} + if ! use build ; then + if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then + einfo "Installing info pages..." + + make PARALLELMFLAGS="${MAKEOPTS} -j1" \ + install_root=${D} \ + info -i + fi + + setup_locales + + if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then + einfo "Installing man pages..." + + # Install linuxthreads man pages even if nptl is enabled + cd "${WORKDIR}"/man + doman *.3thr + fi + + # Install nscd config file + insinto /etc + doins ${FILESDIR}/nscd.conf + doins "${FILESDIR}"/nsswitch.conf + + doinitd "${FILESDIR}"/nscd + + cd ${S} + dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE NEWS NOTES PROJECTS README* + else + rm -rf ${D}/usr/share + for dir in $(get_all_libdirs); do + rm -rf ${D}/usr/${dir}/gconv &> /dev/null + done + fi + + # Is this next line actually needed or does the makefile get it right? + # It previously has 0755 perms which was killing things. + fperms 4711 $(alt_prefix)/lib/misc/glibc/pt_chown + + # Prevent overwriting of the /etc/localtime symlink. We'll handle the + # creation of the "factory" symlink in pkg_postinst(). + rm -f ${D}/etc/localtime + + insinto /etc + # This is our new config file for building locales + doins ${FILESDIR}/locales.build + # example host.conf with multicast dns disabled by default + doins ${FILESDIR}/2.3.4/host.conf + + # simple test to make sure our new glibc isnt completely broken. + # for now, skip the multilib scenario. also make sure we don't + # test with statically built binaries since they will fail. + [[ ${CBUILD} != ${CHOST} ]] && return 0 + [[ $(get_libdir) != "lib" ]] && return 0 + for x in date env ls true uname ; do + x=$(type -p ${x}) + [[ -z ${x} ]] && continue + striptest=$(file -L ${x} 2>/dev/null) + [[ -z ${striptest} ]] && continue + [[ ${striptest/statically linked} != "${striptest}" ]] && continue + "${D}"/$(get_libdir)/ld-*.so \ + --library-path "${D}"/$(get_libdir) \ + ${x} > /dev/null \ + || die "simple run test (${x}) failed" + done +} + +toolchain-glibc_headers_install() { + GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers + cd "${GBUILDDIR}" + make install_root="${D}" install-headers || die "install-headers failed" + # Copy over headers that are not part of install-headers ... these + # are pretty much taken verbatim from crosstool, see it for more details + insinto $(alt_headers)/bits + doins misc/syscall-list.h bits/stdio_lim.h || die "doins include bits" + insinto $(alt_headers)/gnu + doins "${S}"/include/gnu/stubs.h || die "doins include gnu" + # Make sure we install the sys-include symlink so that when + # we build a 2nd stage cross-compiler, gcc finds the target + # system headers correctly. See gcc/doc/gccinstall.info + dosym include $(alt_prefix)/sys-include + dosym . $(alt_prefix)/usr +} + +toolchain-glibc_pkg_postinst() { + # Mixing nptlonly and -nptlonly glibc can prove dangerous if libpthread + # isn't removed in unmerge which happens sometimes. See bug #87671 + if ! is_crosscompile && want_linuxthreads ; then + for libdir in $(get_all_libdirs) ; do + for f in ${ROOT}/${libdir}/libpthread-2.* ${ROOT}/${libdir}/libpthread-0.6* ; do + if [[ -f ${f} ]] ; then + rm -f ${f} + ldconfig + fi + done + done + fi + + # Correct me if I am wrong here, but my /etc/localtime is a file + # created by zic .... + # I am thinking that it should only be recreated if no /etc/localtime + # exists, or if it is an invalid symlink. + # + # For invalid symlink: + # -f && -e will fail + # -L will succeed + # + if [ ! -e "${ROOT}/etc/localtime" ] ; then + echo "Please remember to set your timezone using the zic command." + rm -f ${ROOT}/etc/localtime + ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime + fi + + if ! is_crosscompile && [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then + # Generate fastloading iconv module configuration file. + ${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT} + fi + + if [ ! -e "${ROOT}/lib/ld.so.1" ] && use ppc64 && ! has_multilib_profile ; then + ## SHOULDN'T THIS BE lib64?? + ln -s ld64.so.1 ${ROOT}/lib/ld.so.1 + fi + + # Reload init ... + if ! is_crosscompile && [ "${ROOT}" = "/" ] ; then + /sbin/init U &> /dev/null + fi + + # warn the few multicast-dns-by-default users we've had about the change + # in behavior... + echo + einfo "Gentoo's glibc now disables multicast dns by default in our" + einfo "example host.conf. To re-enable this functionality, simply" + einfo "remove the line that disables it (mdns off)." + echo + + if want_nptl && want_linuxthreads ; then + einfo "The default behavior of glibc on your system is to use NPTL. If" + einfo "you want to use linuxthreads for a particular program, start it" + einfo "by executing 'LD_ASSUME_KERNEL=${LT_KERNEL_VERSION} []'" + echo + fi +} + +### SUPPORT FUNCTIONS ### +# We need to be able to set alternative headers for +# compiling for non-native platform +# Will also become useful for testing kernel-headers without screwing up +# the whole system. +# note: intentionally undocumented. +alt_headers() { + if [[ -z ${ALT_HEADERS} ]] ; then + if is_crosscompile ; then + ALT_HEADERS="/usr/${CTARGET}/include" + else + ALT_HEADERS="/usr/include" + fi + fi + echo "${ALT_HEADERS}" +} + +alt_prefix() { + if is_crosscompile ; then + echo /usr/${CTARGET} + else + echo /usr + fi +} + +alt_libdir() { + if is_crosscompile ; then + echo /usr/${CTARGET}/$(get_libdir) + else + echo /$(get_libdir) + fi +} + +alt_usrlibdir() { + if is_crosscompile ; then + echo /usr/${CTARGET}/$(get_libdir) + else + echo /usr/$(get_libdir) + fi +} + +setup_flags() { + # Make sure host make.conf doesn't pollute us + if is_crosscompile || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi + + # Store our CFLAGS because it's changed depending on which CTARGET + # we are building when pulling glibc on a multilib profile + CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}} + CFLAGS=${CFLAGS_BASE} + ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}} + ASFLAGS=${ASFLAGS_BASE} + + # Over-zealous CFLAGS can often cause problems. What may work for one + # person may not work for another. To avoid a large influx of bugs + # relating to failed builds, we strip most CFLAGS out to ensure as few + # problems as possible. + strip-flags + strip-unsupported-flags + filter-flags -m32 -m64 -mabi=* + + unset CBUILD_OPT CTARGET_OPT + if has_multilib_profile ; then + CTARGET_OPT=$(get_abi_CTARGET) + [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST) + fi + + case $(tc-arch) in + amd64) + # Punt this when amd64's 2004.3 is removed + CFLAGS_x86="-m32" + ;; + ppc) + append-flags "-freorder-blocks" + ;; + sparc) + # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. + filter-flags "-fcall-used-g7" + append-flags "-fcall-used-g6" + filter-flags "-mvis" + + if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then + case ${ABI} in + sparc64) + filter-flags -Wa,-xarch -Wa,-A + + if is-flag "-mcpu=ultrasparc3"; then + CTARGET_OPT="sparc64b-unknown-linux-gnu" + append-flags "-Wa,-xarch=v9b" + export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b" + else + CTARGET_OPT="sparc64-unknown-linux-gnu" + append-flags "-Wa,-xarch=v9a" + export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a" + fi + ;; + *) + if is-flag "-mcpu=ultrasparc3"; then + CTARGET_OPT="sparcv9b-unknown-linux-gnu" + else + CTARGET_OPT="sparcv9-unknown-linux-gnu" + fi + ;; + esac + else + if is-flag "-mcpu=ultrasparc3"; then + CTARGET_OPT="sparcv9b-unknown-linux-gnu" + elif { is_crosscompile && want_nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then + CTARGET_OPT="sparcv9-unknown-linux-gnu" + fi + fi + ;; + esac + + if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then + CBUILD_OPT=${CTARGET_OPT} + fi + + if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then + append-flags -finline-limit=2000 + fi + + # We don't want these flags for glibc + filter-ldflags -pie + + # Lock glibc at -O2 -- linuxthreads needs it and we want to be + # conservative here + filter-flags -O? + append-flags -O2 +} + +check_kheader_version() { + local header="${ROOT}$(alt_headers)/linux/version.h" + + [[ -z $1 ]] && return 1 + + if [ -f "${header}" ] ; then + local version="`grep 'LINUX_VERSION_CODE' ${header} | \ + sed -e 's:^.*LINUX_VERSION_CODE[[:space:]]*::'`" + + if [ "${version}" -ge "$1" ] ; then + return 0 + fi + fi + + return 1 +} + +check_nptl_support() { + local min_kernel_version="$(KV_to_int "${NPTL_KERNEL_VERSION}")" + + echo + + einfon "Checking gcc for __thread support ... " + if want__thread ; then + echo "yes" + else + echo "no" + echo + eerror "Could not find a gcc that supports the __thread directive!" + eerror "please update to gcc-3.2.2-r1 or later, and try again." + die "No __thread support in gcc!" + fi + + # Building fails on an non-supporting kernel + einfon "Checking kernel version (>=${NPTL_KERNEL_VERSION}) ... " + if [ "`get_KV`" -lt "${min_kernel_version}" ] ; then + echo "no" + echo + eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}" + eerror "for NPTL support!" + die "Kernel version too low!" + else + echo "yes" + fi + + # Building fails with too low linux-headers + einfon "Checking linux-headers version (>=${NPTL_KERNEL_VERSION}) ... " + if ! check_kheader_version "${min_kernel_version}"; then + echo "no" + echo + eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}" + eerror "for NPTL support!" + die "linux-headers version too low!" + else + echo "yes" + fi + + echo +} + +want_nptl() { + want_tls || return 1 + use nptl || return 1 + + # Archs that can use NPTL + case $(tc-arch) in + alpha|amd64|ia64|mips|ppc|ppc64|s390|sh|x86) + return 0; + ;; + sparc) + # >= v9 is needed for nptl. + [[ "${PROFILE_ARCH}" == "sparc" ]] && return 1 + return 0; + ;; + esac + + return 1 +} + +want_linuxthreads() { + ! use nptlonly && return 0 + want_nptl || return 0 + return 1 +} + +want_tls() { + # Archs that can use TLS (Thread Local Storage) + case $(tc-arch) in + alpha|amd64|ia64|mips|ppc|ppc64|s390|sh) + return 0; + ;; + sparc) + # 2.3.6 should have tls support on sparc64 + # when using newer binutils + case ${CTARGET/-*} in + sparc64*) return 1 ;; + *) return 0 ;; + esac + ;; + x86) + # requires i486 or better #106556 + [[ ${CTARGET} == i[4567]86* ]] && return 0 + ;; + esac + + return 1 +} + +want__thread() { + want_tls || return 1 + + # For some reason --with-tls --with__thread is causing segfaults on sparc32. + [[ ${PROFILE_ARCH} == "sparc" ]] && return 1 + + [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD} + + $(tc-getCC ${CTARGET}) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null + WANT__THREAD=$? + + return ${WANT__THREAD} +} + +install_locales() { + unset LANGUAGE LANG LC_ALL + cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}" + make PARALLELMFLAGS="${MAKEOPTS} -j1" \ + install_root=${D} localedata/install-locales || die +} + +setup_locales() { + if use !userlocales ; then + einfo "userlocales not enabled, installing -ALL- locales..." + install_locales || die + elif [ -e /etc/locales.build ] ; then + einfo "Installing locales in /etc/locales.build..." + echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales + cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ + >> SUPPORTED.locales + cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die + install_locales || die + elif [ -e ${FILESDIR}/locales.build ] ; then + einfo "Installing locales in ${FILESDIR}/locales.build..." + echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales + cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ + >> SUPPORTED.locales + cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die + install_locales || die + else + einfo "Installing -ALL- locales..." + install_locales || die + fi +} + +glibc_do_configure() { + local myconf + + # set addons + pushd ${S} > /dev/null + ADDONS=$(echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d') + use glibc-compat20 && [[ -d glibc-compat ]] && ADDONS="${ADDONS},glibc-compat" + popd > /dev/null + + use nls || myconf="${myconf} --disable-nls" + use erandom || myconf="${myconf} --disable-dev-erandom" + + use glibc-omitfp && myconf="${myconf} --enable-omitfp" + + [[ ${CTARGET} == *-softfloat-* ]] && myconf="${myconf} --without-fp" + + if [ "$1" == "linuxthreads" ] ; then + if want_tls && [[ ${CTARGET} != i[45]86-* ]] ; then + myconf="${myconf} --with-tls" + + if want__thread && use linuxthreads-tls ; then + myconf="${myconf} --with-__thread" + else + myconf="${myconf} --without-__thread" + fi + else + myconf="${myconf} --without-tls --without-__thread" + fi + + myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}" + myconf="${myconf} --enable-kernel=${LT_KERNEL_VERSION}" + elif [ "$1" == "nptl" ] ; then + myconf="${myconf} --with-tls --with-__thread" + myconf="${myconf} --enable-add-ons=nptl${ADDONS}" + myconf="${myconf} --enable-kernel=${NPTL_KERNEL_VERSION}" + else + die "invalid pthread option" + fi + + # Since SELinux support is only required for nscd, only enable it if: + # 1. USE selinux + # 2. ! USE build + # 3. only for the primary ABI on multilib systems + if use selinux && ! use build; then + if use multilib || has_multilib_profile; then + if is_final_abi; then + myconf="${myconf} --with-selinux" + else + myconf="${myconf} --without-selinux" + fi + else + myconf="${myconf} --with-selinux" + fi + else + myconf="${myconf} --without-selinux" + fi + + # Pick out the correct location for build headers + local headersloc=$(alt_headers) + tc-is-cross-compiler && headersloc=${ROOT}${headersloc} + myconf="${myconf} + --without-cvs + --enable-bind-now + --build=${CBUILD_OPT:-${CBUILD}} + --host=${CTARGET_OPT:-${CTARGET}} + $(use_enable profile) + --without-gd + --with-headers=${headersloc} + --prefix=$(alt_prefix) + --mandir=$(alt_prefix)/share/man + --infodir=$(alt_prefix)/share/info + --libexecdir=$(alt_prefix)/lib/misc/glibc + ${EXTRA_ECONF}" + + has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})" + + GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1 + mkdir -p ${GBUILDDIR} + cd ${GBUILDDIR} + einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}" + ${S}/configure ${myconf} || die "failed to configure glibc" +} + +fix_lib64_symlinks() { + # the original Gentoo/AMD64 devs decided that since 64bit is the native + # bitdepth for AMD64, lib should be used for 64bit libraries. however, + # this ignores the FHS and breaks multilib horribly... especially + # since it wont even work without a lib64 symlink anyways. *rolls eyes* + # see bug 59710 for more information. + # Travis Tilley (08 Aug 2004) + if [ -L ${ROOT}/lib64 ] ; then + ewarn "removing /lib64 symlink and moving lib to lib64..." + ewarn "dont hit ctrl-c until this is done" + addwrite ${ROOT}/ + rm ${ROOT}/lib64 + # now that lib64 is gone, nothing will run without calling ld.so + # directly. luckily the window of brokenness is almost non-existant + use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64 + use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64 + # all better :) + ldconfig + ln -s lib64 ${ROOT}/lib + einfo "done! :-)" + einfo "fixed broken lib64/lib symlink in ${ROOT}" + fi + if [ -L ${ROOT}/usr/lib64 ] ; then + addwrite ${ROOT}/usr + rm ${ROOT}/usr/lib64 + mv ${ROOT}/usr/lib ${ROOT}/usr/lib64 + ln -s lib64 ${ROOT}/usr/lib + einfo "fixed broken lib64/lib symlink in ${ROOT}/usr" + fi + if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then + addwrite ${ROOT}/usr/X11R6 + rm ${ROOT}/usr/X11R6/lib64 + mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64 + ln -s lib64 ${ROOT}/usr/X11R6/lib + einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6" + fi +} + +use_multilib() { + case ${CTARGET} in + sparc64*|mips64*|x86_64*|powerpc64*|s390x*) + has_multilib_profile || use multilib ;; + *) false ;; + esac +} + +# Setup toolchain variables that would be defined in the profiles for these archs. +setup_env() { + # These should not be set, else the zoneinfo do not always get installed ... + unset LANGUAGE LANG LC_ALL + # silly users + unset LD_RUN_PATH + + if is_crosscompile || tc-is-cross-compiler ; then + multilib_env ${CTARGET} + if ! use multilib ; then + MULTILIB_ABIS=${DEFAULT_ABI} + else + MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} + fi + + # If the user has CFLAGS_ in their make.conf, use that, + # and fall back on CFLAGS. + local VAR=CFLAGS_${CTARGET//[-.]/_} + CFLAGS=${!VAR-${CFLAGS}} + fi + + setup_flags + + export ABI=${ABI:-${DEFAULT_ABI:-default}} + + if is_crosscompile || tc-is-cross-compiler ; then + local VAR=CFLAGS_${ABI} + # We need to export CFLAGS with abi information in them because + # glibc's configure script checks CFLAGS for some targets (like mips) + export CFLAGS="${!VAR} ${CFLAGS}" + fi +} + +### /ECLASS PUNTAGE ### + +if is_crosscompile ; then + SLOT="${CTARGET}-2.2" +else + SLOT="2.2" +fi + +# we'll handle stripping ourself #46186 +RESTRICT="nostrip multilib-pkg-force" + +# We need a new-enough binutils for as-needed +DEPEND=">=sys-devel/gcc-3.3.3 + nptl? ( >=sys-kernel/linux-headers-2.6.5 ) + >=sys-devel/binutils-2.16.1 + >=sys-devel/gcc-config-1.3.12 + virtual/os-headers + nls? ( sys-devel/gettext ) + selinux? ( !build? ( sys-libs/libselinux ) )" +RDEPEND="nls? ( sys-devel/gettext ) + selinux? ( !build? ( sys-libs/libselinux ) )" + +if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + DEPEND="${DEPEND} ${CATEGORY}/gcc" + + if [[ ${CATEGORY} == *-linux* ]] ; then + if [[ ${CATEGORY} == cross-mips* ]] ; then + DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10" + else + DEPEND="${DEPEND} ${CATEGORY}/linux-headers" + fi + fi +else + DEPEND="${DEPEND} sys-libs/timezone-data" + RDEPEND="${RDEPEND} sys-libs/timezone-data" +fi + +pkg_setup() { + if portageq has_version / '>=sys-libs/glibc-2.3.5.20050201' && \ + portageq has_version / ' ${T}/gcc_eh_test.c + if ! $(tc-getCC ${CTARGET}) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then + sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh" + fi + + # Some configure checks fail on the first emerge through because they + # try to link. This doesn't work well if we don't have a libc yet. + # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html + if is_crosscompile && use build; then + rm ${S}/sysdeps/sparc/sparc64/elf/configure{,.in} + rm ${S}/nptl/sysdeps/pthread/configure{,.in} + fi + + cd "${WORKDIR}" + find . -type f '(' -size 0 -o -name "*.orig" ')' -exec rm -f {} \; + find . -name configure -exec touch {} \; + + # Fix permissions on some of the scripts + chmod u+x "${S}"/scripts/*.sh +} + +src_compile() { + setup_env + + if [[ -z ${OABI} ]] ; then + local abilist="" + if has_multilib_profile ; then + abilist=$(get_install_abis) + einfo "Building multilib glibc for ABIs: ${abilist}" + elif is_crosscompile || tc-is-cross-compiler ; then + abilist=${DEFAULT_ABI} + fi + if [[ -n ${abilist} ]] ; then + OABI=${ABI} + for ABI in ${abilist} ; do + export ABI + src_compile + done + ABI=${OABI} + unset OABI + return 0 + fi + fi + + if just_headers ; then + toolchain-glibc_headers_compile + else + toolchain-glibc_src_compile + fi +} + +src_test() { + setup_env + + if [[ -z ${OABI} ]] && has_multilib_profile ; then + OABI=${ABI} + einfo "Testing multilib glibc for ABIs: $(get_install_abis)" + for ABI in $(get_install_abis) ; do + export ABI + einfo " Testing ${ABI} glibc" + src_test + done + ABI=${OABI} + unset OABI + return 0 + fi + + toolchain-glibc_src_test +} + +src_install() { + setup_env + + if [[ -z ${OABI} ]] ; then + local abilist="" + if has_multilib_profile ; then + abilist=$(get_install_abis) + einfo "Installing multilib glibc for ABIs: ${abilist}" + elif is_crosscompile || tc-is-cross-compiler ; then + abilist=${DEFAULT_ABI} + fi + if [[ -n ${abilist} ]] ; then + OABI=${ABI} + for ABI in ${abilist} ; do + export ABI + src_install + done + ABI=${OABI} + unset OABI + return 0 + fi + fi + + # Handle stupid lib32 BS + unset OLD_LIBDIR + if ! is_crosscompile ; then + if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then + OLD_LIBDIR=$(get_libdir) + LIBDIR_x86="lib" + fi + + if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then + OLD_LIBDIR=$(get_libdir) + LIBDIR_ppc="lib" + fi + fi + + if just_headers ; then + toolchain-glibc_headers_install + else + toolchain-glibc_src_install + fi + + # Handle stupid lib32 BS on amd64 and ppc64 + if [[ -n ${OLD_LIBDIR} ]] ; then + cd "${S}" + [[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR} + [[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR} + unset OLD_LIBDIR + + mv "${D}"/lib "${D}"/$(get_libdir) + mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) + dodir /lib + dodir /usr/lib + mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib + [[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2 + [[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1 + + for f in "${D}"/usr/$(get_libdir)/*.so; do + local basef=$(basename "${f}") + if [[ -L ${f} ]] ; then + local target=$(readlink "${f}") + target=${target/\/lib\//\/$(get_libdir)\/} + rm "${f}" + dosym "${target}" /usr/$(get_libdir)/"${basef}" + fi + done + + dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so + + if want_nptl && want_linuxthreads ; then + dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so + fi + fi +} + +pkg_preinst() { + toolchain-glibc_pkg_preinst +} + +pkg_postinst() { + toolchain-glibc_pkg_postinst +} -- cgit v1.2.3-65-gdbad