| 1 |
vapier 12/06/03 08:58:19 |
| 2 |
|
| 3 |
Modified: glibc-2.15-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Update x32 patchset. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 sys-libs/glibc/glibc-2.15-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: glibc-2.15-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- glibc-2.15-r2.ebuild 1 Jun 2012 18:03:35 -0000 1.4 |
| 23 |
+++ glibc-2.15-r2.ebuild 3 Jun 2012 08:58:19 -0000 1.5 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.4 2012/06/01 18:03:35 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.5 2012/06/03 08:58:19 vapier Exp $ |
| 29 |
|
| 30 |
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker |
| 31 |
|
| 32 |
@@ -33,7 +33,7 @@ |
| 33 |
MANPAGE_VER="" # pregenerated manpages |
| 34 |
INFOPAGE_VER="" # pregenerated infopages |
| 35 |
LIBIDN_VER="" # it's integrated into the main tarball now |
| 36 |
-PATCH_VER="14" # Gentoo patchset |
| 37 |
+PATCH_VER="15" # Gentoo patchset |
| 38 |
PORTS_VER=${RELEASE_VER} # version of glibc ports addon |
| 39 |
NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires |
| 40 |
|
| 41 |
@@ -177,7 +177,11 @@ |
| 42 |
done |
| 43 |
|
| 44 |
eblit-src_unpack-pre() { |
| 45 |
- GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch" |
| 46 |
+ if [[ ${CTARGET} == x86_64* ]] && has x32 $(get_all_abis) ; then |
| 47 |
+ GLIBC_PATCH_EXCLUDE+=" 0080_all_glibc-2.15-revert-x86_64-eagain-pthread_cond_wait.patch" |
| 48 |
+ else |
| 49 |
+ GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch" |
| 50 |
+ fi |
| 51 |
} |
| 52 |
|
| 53 |
eblit-src_unpack-post() { |
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.857 sys-libs/glibc/ChangeLog |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.857&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.857&content-type=text/plain |
| 61 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/ChangeLog?r1=1.856&r2=1.857 |
| 62 |
|
| 63 |
Index: ChangeLog |
| 64 |
=================================================================== |
| 65 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v |
| 66 |
retrieving revision 1.856 |
| 67 |
retrieving revision 1.857 |
| 68 |
diff -u -r1.856 -r1.857 |
| 69 |
--- ChangeLog 1 Jun 2012 18:03:35 -0000 1.856 |
| 70 |
+++ ChangeLog 3 Jun 2012 08:58:19 -0000 1.857 |
| 71 |
@@ -1,6 +1,9 @@ |
| 72 |
# ChangeLog for sys-libs/glibc |
| 73 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 74 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.856 2012/06/01 18:03:35 vapier Exp $ |
| 75 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.857 2012/06/03 08:58:19 vapier Exp $ |
| 76 |
+ |
| 77 |
+ 03 Jun 2012; Mike Frysinger <vapier@g.o> glibc-2.15-r2.ebuild: |
| 78 |
+ Update x32 patchset. |
| 79 |
|
| 80 |
01 Jun 2012; Mike Frysinger <vapier@g.o> glibc-2.14.1-r2.ebuild, |
| 81 |
glibc-2.14.1-r3.ebuild, glibc-2.14.ebuild, glibc-2.15-r1.ebuild, |
Archives