diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-03-29 05:31:59 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-03-29 05:31:59 +0000 |
| commit | c99ed88a2fba13b6ac126e05f7d1ca98cda262b7 (patch) | |
| tree | 4da079ce37e30f510ab561aa954bf1e5ebc362da /sys-libs/glibc/glibc-2.19.ebuild | |
| parent | Fix underlinking (missing -lm for function rintf()) wrt #504270 by Hector Martin (diff) | |
| download | gentoo-2-c99ed88a2fba13b6ac126e05f7d1ca98cda262b7.tar.gz gentoo-2-c99ed88a2fba13b6ac126e05f7d1ca98cda262b7.tar.bz2 gentoo-2-c99ed88a2fba13b6ac126e05f7d1ca98cda262b7.zip | |
Add support for in-place bootstrapping between ABIs (on x86 for now).
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs/glibc/glibc-2.19.ebuild')
| -rw-r--r-- | sys-libs/glibc/glibc-2.19.ebuild | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/sys-libs/glibc/glibc-2.19.ebuild b/sys-libs/glibc/glibc-2.19.ebuild index 646c1a264daf..93e0aa46f858 100644 --- a/sys-libs/glibc/glibc-2.19.ebuild +++ b/sys-libs/glibc/glibc-2.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild,v 1.3 2014/03/12 13:34:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild,v 1.4 2014/03/29 05:31:59 vapier Exp $ inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing @@ -24,6 +24,7 @@ case ${PV} in RELEASE_VER=${PV} ;; esac +GCC_BOOTSTRAP_VER="4.7.3" PATCH_VER="1" # Gentoo patchset NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires @@ -88,19 +89,19 @@ else !vanilla? ( sys-libs/timezone-data )" fi +upstream_uris() { + echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 +} +gentoo_uris() { + local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" + devspace=${devspace//HTTP/http://dev.gentoo.org/} + echo mirror://gentoo/$1 ${devspace//URI/$1} +} SRC_URI=$( - upstream_uris() { - echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 - } - gentoo_uris() { - local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" - devspace=${devspace//HTTP/http://dev.gentoo.org/} - echo mirror://gentoo/$1 ${devspace//URI/$1} - } - [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 ) +SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" # eblit-include [--skip] <function> [version] eblit-include() { @@ -151,6 +152,10 @@ for x in setup {pre,post}inst ; do fi done +eblit-src_unpack-pre() { + [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-4.7.3-multilib-bootstrap.tar.bz2 +} + eblit-src_unpack-post() { if use hardened ; then cd "${S}" |