vapier 14/03/29 06:11:19 Modified: ChangeLog glibc-9999.ebuild Log: Also add bootstrap logic to glibc-9999. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.990 sys-libs/glibc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.990&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.990&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?r1=1.989&r2=1.990 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v retrieving revision 1.989 retrieving revision 1.990 diff -u -r1.989 -r1.990 --- ChangeLog 29 Mar 2014 05:31:59 -0000 1.989 +++ ChangeLog 29 Mar 2014 06:11:19 -0000 1.990 @@ -1,10 +1,10 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.989 2014/03/29 05:31:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.990 2014/03/29 06:11:19 vapier Exp $ 29 Mar 2014; Mike Frysinger <[email protected]> files/eblits/src_compile.eblit, files/eblits/src_unpack.eblit, - glibc-2.17.ebuild, glibc-2.18-r1.ebuild, glibc-2.19.ebuild: + glibc-2.17.ebuild, glibc-2.18-r1.ebuild, glibc-2.19.ebuild, glibc-9999.ebuild: Add support for in-place bootstrapping between ABIs (on x86 for now). 25 Mar 2014; Mike Frysinger <[email protected]> 1.23 sys-libs/glibc/glibc-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild?rev=1.23&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild?rev=1.23&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild?r1=1.22&r2=1.23 Index: glibc-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- glibc-9999.ebuild 12 Mar 2014 13:35:10 -0000 1.22 +++ glibc-9999.ebuild 29 Mar 2014 06:11:19 -0000 1.23 @@ -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-9999.ebuild,v 1.22 2014/03/12 13:35:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.23 2014/03/29 06:11:19 vapier Exp $ inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing @@ -8,7 +8,7 @@ HOMEPAGE="http://www.gnu.org/software/libc/libc.html"; LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" RESTRICT="strip" # strip ourself #46186 EMULTILIB_PKG="true" @@ -24,6 +24,7 @@ RELEASE_VER=${PV} ;; esac +GCC_BOOTSTRAP_VER="4.7.3" PATCH_VER="" # Gentoo patchset NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires @@ -88,19 +89,19 @@ !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 @@ 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}"
