| 1 |
vapier 14/03/29 05:32:00 |
| 2 |
|
| 3 |
Modified: glibc-2.19.ebuild glibc-2.17.ebuild |
| 4 |
glibc-2.18-r1.ebuild ChangeLog |
| 5 |
Log: |
| 6 |
Add support for in-place bootstrapping between ABIs (on x86 for now). |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.4 sys-libs/glibc/glibc-2.19.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild?rev=1.4&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild?rev=1.4&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild?r1=1.3&r2=1.4 |
| 16 |
|
| 17 |
Index: glibc-2.19.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild,v |
| 20 |
retrieving revision 1.3 |
| 21 |
retrieving revision 1.4 |
| 22 |
diff -u -r1.3 -r1.4 |
| 23 |
--- glibc-2.19.ebuild 12 Mar 2014 13:34:07 -0000 1.3 |
| 24 |
+++ glibc-2.19.ebuild 29 Mar 2014 05:31:59 -0000 1.4 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild,v 1.3 2014/03/12 13:34:07 vapier Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild,v 1.4 2014/03/29 05:31:59 vapier Exp $ |
| 30 |
|
| 31 |
inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing |
| 32 |
|
| 33 |
@@ -24,6 +24,7 @@ |
| 34 |
RELEASE_VER=${PV} |
| 35 |
;; |
| 36 |
esac |
| 37 |
+GCC_BOOTSTRAP_VER="4.7.3" |
| 38 |
PATCH_VER="1" # Gentoo patchset |
| 39 |
NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires |
| 40 |
|
| 41 |
@@ -88,19 +89,19 @@ |
| 42 |
!vanilla? ( sys-libs/timezone-data )" |
| 43 |
fi |
| 44 |
|
| 45 |
+upstream_uris() { |
| 46 |
+ echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
| 47 |
+} |
| 48 |
+gentoo_uris() { |
| 49 |
+ local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" |
| 50 |
+ devspace=${devspace//HTTP/http://dev.gentoo.org/} |
| 51 |
+ echo mirror://gentoo/$1 ${devspace//URI/$1} |
| 52 |
+} |
| 53 |
SRC_URI=$( |
| 54 |
- upstream_uris() { |
| 55 |
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
| 56 |
- } |
| 57 |
- gentoo_uris() { |
| 58 |
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" |
| 59 |
- devspace=${devspace//HTTP/http://dev.gentoo.org/} |
| 60 |
- echo mirror://gentoo/$1 ${devspace//URI/$1} |
| 61 |
- } |
| 62 |
- |
| 63 |
[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz |
| 64 |
[[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 |
| 65 |
) |
| 66 |
+SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" |
| 67 |
|
| 68 |
# eblit-include [--skip] <function> [version] |
| 69 |
eblit-include() { |
| 70 |
@@ -151,6 +152,10 @@ |
| 71 |
fi |
| 72 |
done |
| 73 |
|
| 74 |
+eblit-src_unpack-pre() { |
| 75 |
+ [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-4.7.3-multilib-bootstrap.tar.bz2 |
| 76 |
+} |
| 77 |
+ |
| 78 |
eblit-src_unpack-post() { |
| 79 |
if use hardened ; then |
| 80 |
cd "${S}" |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
1.33 sys-libs/glibc/glibc-2.17.ebuild |
| 85 |
|
| 86 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild?rev=1.33&view=markup |
| 87 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild?rev=1.33&content-type=text/plain |
| 88 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild?r1=1.32&r2=1.33 |
| 89 |
|
| 90 |
Index: glibc-2.17.ebuild |
| 91 |
=================================================================== |
| 92 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v |
| 93 |
retrieving revision 1.32 |
| 94 |
retrieving revision 1.33 |
| 95 |
diff -u -r1.32 -r1.33 |
| 96 |
--- glibc-2.17.ebuild 20 Mar 2014 13:38:22 -0000 1.32 |
| 97 |
+++ glibc-2.17.ebuild 29 Mar 2014 05:31:59 -0000 1.33 |
| 98 |
@@ -1,6 +1,6 @@ |
| 99 |
# Copyright 1999-2014 Gentoo Foundation |
| 100 |
# Distributed under the terms of the GNU General Public License v2 |
| 101 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.32 2014/03/20 13:38:22 ago Exp $ |
| 102 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.33 2014/03/29 05:31:59 vapier Exp $ |
| 103 |
|
| 104 |
inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing |
| 105 |
|
| 106 |
@@ -24,6 +24,7 @@ |
| 107 |
RELEASE_VER=${PV} |
| 108 |
;; |
| 109 |
esac |
| 110 |
+GCC_BOOTSTRAP_VER="4.7.3" |
| 111 |
PATCH_VER="8" # Gentoo patchset |
| 112 |
NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires |
| 113 |
|
| 114 |
@@ -88,19 +89,19 @@ |
| 115 |
!vanilla? ( sys-libs/timezone-data )" |
| 116 |
fi |
| 117 |
|
| 118 |
+upstream_uris() { |
| 119 |
+ echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
| 120 |
+} |
| 121 |
+gentoo_uris() { |
| 122 |
+ local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" |
| 123 |
+ devspace=${devspace//HTTP/http://dev.gentoo.org/} |
| 124 |
+ echo mirror://gentoo/$1 ${devspace//URI/$1} |
| 125 |
+} |
| 126 |
SRC_URI=$( |
| 127 |
- upstream_uris() { |
| 128 |
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
| 129 |
- } |
| 130 |
- gentoo_uris() { |
| 131 |
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" |
| 132 |
- devspace=${devspace//HTTP/http://dev.gentoo.org/} |
| 133 |
- echo mirror://gentoo/$1 ${devspace//URI/$1} |
| 134 |
- } |
| 135 |
- |
| 136 |
[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz |
| 137 |
[[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 |
| 138 |
) |
| 139 |
+SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" |
| 140 |
|
| 141 |
# eblit-include [--skip] <function> [version] |
| 142 |
eblit-include() { |
| 143 |
@@ -153,6 +154,7 @@ |
| 144 |
|
| 145 |
eblit-src_unpack-pre() { |
| 146 |
GLIBC_PATCH_EXCLUDE+=" 6600_mips_librt-mips.patch" #456912 |
| 147 |
+ [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-4.7.3-multilib-bootstrap.tar.bz2 |
| 148 |
} |
| 149 |
|
| 150 |
eblit-src_unpack-post() { |
| 151 |
|
| 152 |
|
| 153 |
|
| 154 |
1.3 sys-libs/glibc/glibc-2.18-r1.ebuild |
| 155 |
|
| 156 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.18-r1.ebuild?rev=1.3&view=markup |
| 157 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.18-r1.ebuild?rev=1.3&content-type=text/plain |
| 158 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.18-r1.ebuild?r1=1.2&r2=1.3 |
| 159 |
|
| 160 |
Index: glibc-2.18-r1.ebuild |
| 161 |
=================================================================== |
| 162 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.18-r1.ebuild,v |
| 163 |
retrieving revision 1.2 |
| 164 |
retrieving revision 1.3 |
| 165 |
diff -u -r1.2 -r1.3 |
| 166 |
--- glibc-2.18-r1.ebuild 25 Jan 2014 22:06:39 -0000 1.2 |
| 167 |
+++ glibc-2.18-r1.ebuild 29 Mar 2014 05:31:59 -0000 1.3 |
| 168 |
@@ -1,6 +1,6 @@ |
| 169 |
# Copyright 1999-2014 Gentoo Foundation |
| 170 |
# Distributed under the terms of the GNU General Public License v2 |
| 171 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.18-r1.ebuild,v 1.2 2014/01/25 22:06:39 vapier Exp $ |
| 172 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.18-r1.ebuild,v 1.3 2014/03/29 05:31:59 vapier Exp $ |
| 173 |
|
| 174 |
inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing |
| 175 |
|
| 176 |
@@ -24,6 +24,7 @@ |
| 177 |
RELEASE_VER=${PV} |
| 178 |
;; |
| 179 |
esac |
| 180 |
+GCC_BOOTSTRAP_VER="4.7.3" |
| 181 |
PATCH_VER="4" # Gentoo patchset |
| 182 |
NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires |
| 183 |
|
| 184 |
@@ -88,19 +89,19 @@ |
| 185 |
!vanilla? ( sys-libs/timezone-data )" |
| 186 |
fi |
| 187 |
|
| 188 |
+upstream_uris() { |
| 189 |
+ echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
| 190 |
+} |
| 191 |
+gentoo_uris() { |
| 192 |
+ local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" |
| 193 |
+ devspace=${devspace//HTTP/http://dev.gentoo.org/} |
| 194 |
+ echo mirror://gentoo/$1 ${devspace//URI/$1} |
| 195 |
+} |
| 196 |
SRC_URI=$( |
| 197 |
- upstream_uris() { |
| 198 |
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
| 199 |
- } |
| 200 |
- gentoo_uris() { |
| 201 |
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" |
| 202 |
- devspace=${devspace//HTTP/http://dev.gentoo.org/} |
| 203 |
- echo mirror://gentoo/$1 ${devspace//URI/$1} |
| 204 |
- } |
| 205 |
- |
| 206 |
[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz |
| 207 |
[[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 |
| 208 |
) |
| 209 |
+SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" |
| 210 |
|
| 211 |
# eblit-include [--skip] <function> [version] |
| 212 |
eblit-include() { |
| 213 |
@@ -153,6 +154,7 @@ |
| 214 |
|
| 215 |
eblit-src_unpack-pre() { |
| 216 |
GLIBC_PATCH_EXCLUDE+=" 00_all_0012-mips-add-clock_-g-s-ettime-symbol-compat-hacks.patch" #456912 #481438 |
| 217 |
+ [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-4.7.3-multilib-bootstrap.tar.bz2 |
| 218 |
} |
| 219 |
|
| 220 |
eblit-src_unpack-post() { |
| 221 |
|
| 222 |
|
| 223 |
|
| 224 |
1.989 sys-libs/glibc/ChangeLog |
| 225 |
|
| 226 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.989&view=markup |
| 227 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.989&content-type=text/plain |
| 228 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?r1=1.988&r2=1.989 |
| 229 |
|
| 230 |
Index: ChangeLog |
| 231 |
=================================================================== |
| 232 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v |
| 233 |
retrieving revision 1.988 |
| 234 |
retrieving revision 1.989 |
| 235 |
diff -u -r1.988 -r1.989 |
| 236 |
--- ChangeLog 25 Mar 2014 00:34:56 -0000 1.988 |
| 237 |
+++ ChangeLog 29 Mar 2014 05:31:59 -0000 1.989 |
| 238 |
@@ -1,6 +1,11 @@ |
| 239 |
# ChangeLog for sys-libs/glibc |
| 240 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 241 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.988 2014/03/25 00:34:56 vapier Exp $ |
| 242 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.989 2014/03/29 05:31:59 vapier Exp $ |
| 243 |
+ |
| 244 |
+ 29 Mar 2014; Mike Frysinger <vapier@g.o> |
| 245 |
+ files/eblits/src_compile.eblit, files/eblits/src_unpack.eblit, |
| 246 |
+ glibc-2.17.ebuild, glibc-2.18-r1.ebuild, glibc-2.19.ebuild: |
| 247 |
+ Add support for in-place bootstrapping between ABIs (on x86 for now). |
| 248 |
|
| 249 |
25 Mar 2014; Mike Frysinger <vapier@g.o> |
| 250 |
files/eblits/src_install.eblit: |
Archives