vapier 14/03/29 05:32:00
Modified: glibc-2.19.ebuild glibc-2.17.ebuild
glibc-2.18-r1.ebuild ChangeLog
Log:
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)
Revision Changes Path
1.4 sys-libs/glibc/glibc-2.19.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild?r1=1.3&r2=1.4
Index: glibc-2.19.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glibc-2.19.ebuild 12 Mar 2014 13:34:07 -0000 1.3
+++ glibc-2.19.ebuild 29 Mar 2014 05:31:59 -0000 1.4
@@ -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 @@
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 @@
!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}"
1.33 sys-libs/glibc/glibc-2.17.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild?rev=1.33&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild?rev=1.33&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild?r1=1.32&r2=1.33
Index: glibc-2.17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- glibc-2.17.ebuild 20 Mar 2014 13:38:22 -0000 1.32
+++ glibc-2.17.ebuild 29 Mar 2014 05:31:59 -0000 1.33
@@ -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.17.ebuild,v 1.32
2014/03/20 13:38:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.33
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 @@
RELEASE_VER=${PV}
;;
esac
+GCC_BOOTSTRAP_VER="4.7.3"
PATCH_VER="8" # 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() {
@@ -153,6 +154,7 @@
eblit-src_unpack-pre() {
GLIBC_PATCH_EXCLUDE+=" 6600_mips_librt-mips.patch" #456912
+ [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack
gcc-4.7.3-multilib-bootstrap.tar.bz2
}
eblit-src_unpack-post() {
1.3 sys-libs/glibc/glibc-2.18-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.18-r1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.18-r1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.18-r1.ebuild?r1=1.2&r2=1.3
Index: glibc-2.18-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.18-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glibc-2.18-r1.ebuild 25 Jan 2014 22:06:39 -0000 1.2
+++ glibc-2.18-r1.ebuild 29 Mar 2014 05:31:59 -0000 1.3
@@ -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.18-r1.ebuild,v 1.2
2014/01/25 22:06:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.18-r1.ebuild,v 1.3
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 @@
RELEASE_VER=${PV}
;;
esac
+GCC_BOOTSTRAP_VER="4.7.3"
PATCH_VER="4" # 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() {
@@ -153,6 +154,7 @@
eblit-src_unpack-pre() {
GLIBC_PATCH_EXCLUDE+="
00_all_0012-mips-add-clock_-g-s-ettime-symbol-compat-hacks.patch" #456912
#481438
+ [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack
gcc-4.7.3-multilib-bootstrap.tar.bz2
}
eblit-src_unpack-post() {
1.989 sys-libs/glibc/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.989&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.989&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?r1=1.988&r2=1.989
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v
retrieving revision 1.988
retrieving revision 1.989
diff -u -r1.988 -r1.989
--- ChangeLog 25 Mar 2014 00:34:56 -0000 1.988
+++ ChangeLog 29 Mar 2014 05:31:59 -0000 1.989
@@ -1,6 +1,11 @@
# 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.988 2014/03/25
00:34:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.989 2014/03/29
05:31:59 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:
+ Add support for in-place bootstrapping between ABIs (on x86 for now).
25 Mar 2014; Mike Frysinger <[email protected]>
files/eblits/src_install.eblit:
