summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-07-20 04:59:47 +0000
committerMike Frysinger <vapier@gentoo.org>2009-07-20 04:59:47 +0000
commit577a7936bb7c87b2a59ed728289dc991f90bdddf (patch)
tree34a4a5250b08598693ead48374ac7f3ad3766ea1 /sys-libs/uclibc
parentadd -mplt to allowed flags #278276 by Zhang Le (diff)
downloadgentoo-2-577a7936bb7c87b2a59ed728289dc991f90bdddf.tar.gz
gentoo-2-577a7936bb7c87b2a59ed728289dc991f90bdddf.tar.bz2
gentoo-2-577a7936bb7c87b2a59ed728289dc991f90bdddf.zip
Fix getline() conflict with glibc-2.10 #277186 by Diego E. Pettenò.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/uclibc')
-rw-r--r--sys-libs/uclibc/ChangeLog6
-rw-r--r--sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild4
-rw-r--r--sys-libs/uclibc/uclibc-0.9.30.1.ebuild4
3 files changed, 11 insertions, 3 deletions
diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index c904857ed06d..c42d66378665 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/uclibc
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.45 2009/03/12 18:50:12 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.46 2009/07/20 04:59:47 vapier Exp $
+
+ 20 Jul 2009; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.30.1.ebuild,
+ uclibc-0.9.30.1-r1.ebuild:
+ Fix getline() conflict with glibc-2.10 #277186 by Diego E. Pettenò.
*uclibc-0.9.30.1-r1 (12 Mar 2009)
diff --git a/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild
index 6dad829aa93e..0f517fce6877 100644
--- a/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild,v 1.1 2009/03/12 18:50:12 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild,v 1.2 2009/07/20 04:59:47 vapier Exp $
#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
#inherit subversion
@@ -165,6 +165,8 @@ src_unpack() {
epatch "${WORKDIR}"/patch
fi
+ sed -i 's:getline:get_line:' extra/scripts/unifdef.c #277186
+
########## CPU SELECTION ##########
local target config_target
diff --git a/sys-libs/uclibc/uclibc-0.9.30.1.ebuild b/sys-libs/uclibc/uclibc-0.9.30.1.ebuild
index bd86faf335f9..906fe3ed6d9a 100644
--- a/sys-libs/uclibc/uclibc-0.9.30.1.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.30.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1.ebuild,v 1.2 2009/03/04 16:20:11 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1.ebuild,v 1.3 2009/07/20 04:59:47 vapier Exp $
#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
#inherit subversion
@@ -165,6 +165,8 @@ src_unpack() {
epatch "${WORKDIR}"/patch
fi
+ sed -i 's:getline:get_line:' extra/scripts/unifdef.c #277186
+
########## CPU SELECTION ##########
local target config_target