| 1 |
vapier 14/03/29 06:11:19 |
| 2 |
|
| 3 |
Modified: ChangeLog glibc-9999.ebuild |
| 4 |
Log: |
| 5 |
Also add bootstrap logic to glibc-9999. |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.990 sys-libs/glibc/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.990&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.990&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?r1=1.989&r2=1.990 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v |
| 19 |
retrieving revision 1.989 |
| 20 |
retrieving revision 1.990 |
| 21 |
diff -u -r1.989 -r1.990 |
| 22 |
--- ChangeLog 29 Mar 2014 05:31:59 -0000 1.989 |
| 23 |
+++ ChangeLog 29 Mar 2014 06:11:19 -0000 1.990 |
| 24 |
@@ -1,10 +1,10 @@ |
| 25 |
# ChangeLog for sys-libs/glibc |
| 26 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.989 2014/03/29 05:31:59 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.990 2014/03/29 06:11:19 vapier Exp $ |
| 29 |
|
| 30 |
29 Mar 2014; Mike Frysinger <vapier@g.o> |
| 31 |
files/eblits/src_compile.eblit, files/eblits/src_unpack.eblit, |
| 32 |
- glibc-2.17.ebuild, glibc-2.18-r1.ebuild, glibc-2.19.ebuild: |
| 33 |
+ glibc-2.17.ebuild, glibc-2.18-r1.ebuild, glibc-2.19.ebuild, glibc-9999.ebuild: |
| 34 |
Add support for in-place bootstrapping between ABIs (on x86 for now). |
| 35 |
|
| 36 |
25 Mar 2014; Mike Frysinger <vapier@g.o> |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.23 sys-libs/glibc/glibc-9999.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild?rev=1.23&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild?rev=1.23&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild?r1=1.22&r2=1.23 |
| 45 |
|
| 46 |
Index: glibc-9999.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v |
| 49 |
retrieving revision 1.22 |
| 50 |
retrieving revision 1.23 |
| 51 |
diff -u -r1.22 -r1.23 |
| 52 |
--- glibc-9999.ebuild 12 Mar 2014 13:35:10 -0000 1.22 |
| 53 |
+++ glibc-9999.ebuild 29 Mar 2014 06:11:19 -0000 1.23 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2014 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.22 2014/03/12 13:35:10 vapier Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.23 2014/03/29 06:11:19 vapier Exp $ |
| 59 |
|
| 60 |
inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing |
| 61 |
|
| 62 |
@@ -8,7 +8,7 @@ |
| 63 |
HOMEPAGE="http://www.gnu.org/software/libc/libc.html" |
| 64 |
|
| 65 |
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" |
| 66 |
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 67 |
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 68 |
RESTRICT="strip" # strip ourself #46186 |
| 69 |
EMULTILIB_PKG="true" |
| 70 |
|
| 71 |
@@ -24,6 +24,7 @@ |
| 72 |
RELEASE_VER=${PV} |
| 73 |
;; |
| 74 |
esac |
| 75 |
+GCC_BOOTSTRAP_VER="4.7.3" |
| 76 |
PATCH_VER="" # Gentoo patchset |
| 77 |
NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires |
| 78 |
|
| 79 |
@@ -88,19 +89,19 @@ |
| 80 |
!vanilla? ( sys-libs/timezone-data )" |
| 81 |
fi |
| 82 |
|
| 83 |
+upstream_uris() { |
| 84 |
+ echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
| 85 |
+} |
| 86 |
+gentoo_uris() { |
| 87 |
+ local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" |
| 88 |
+ devspace=${devspace//HTTP/http://dev.gentoo.org/} |
| 89 |
+ echo mirror://gentoo/$1 ${devspace//URI/$1} |
| 90 |
+} |
| 91 |
SRC_URI=$( |
| 92 |
- upstream_uris() { |
| 93 |
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
| 94 |
- } |
| 95 |
- gentoo_uris() { |
| 96 |
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" |
| 97 |
- devspace=${devspace//HTTP/http://dev.gentoo.org/} |
| 98 |
- echo mirror://gentoo/$1 ${devspace//URI/$1} |
| 99 |
- } |
| 100 |
- |
| 101 |
[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz |
| 102 |
[[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 |
| 103 |
) |
| 104 |
+SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" |
| 105 |
|
| 106 |
# eblit-include [--skip] <function> [version] |
| 107 |
eblit-include() { |
| 108 |
@@ -151,6 +152,10 @@ |
| 109 |
fi |
| 110 |
done |
| 111 |
|
| 112 |
+eblit-src_unpack-pre() { |
| 113 |
+ [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-4.7.3-multilib-bootstrap.tar.bz2 |
| 114 |
+} |
| 115 |
+ |
| 116 |
eblit-src_unpack-post() { |
| 117 |
if use hardened ; then |
| 118 |
cd "${S}" |
Archives