summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-06-05 19:53:12 +0000
committerMike Frysinger <vapier@gentoo.org>2010-06-05 19:53:12 +0000
commit580704a14ddd6b6c1217d82c58bd41e4e0354ece (patch)
tree8fa21d5b7bf1083607e5d62b792b9d5e48c3659c /app-misc/screen
parentDon't eautoreconf. (bug #322875) (diff)
downloadgentoo-2-580704a14ddd6b6c1217d82c58bd41e4e0354ece.tar.gz
gentoo-2-580704a14ddd6b6c1217d82c58bd41e4e0354ece.tar.bz2
gentoo-2-580704a14ddd6b6c1217d82c58bd41e4e0354ece.zip
Rename local sched.h to avoid C library conflicts.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/screen')
-rw-r--r--app-misc/screen/ChangeLog7
-rw-r--r--app-misc/screen/screen-4.0.3.ebuild8
2 files changed, 11 insertions, 4 deletions
diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 7c661ee452fa..4f3678d5a0ff 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-misc/screen
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.145 2009/12/12 19:51:13 swegener Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.146 2010/06/05 19:53:12 vapier Exp $
+
+ 05 Jun 2010; Mike Frysinger <vapier@gentoo.org> screen-4.0.3.ebuild:
+ Rename local sched.h to avoid C library conflicts.
12 Dec 2009; Sven Wegener <swegener@gentoo.org> screen-4.0.3.ebuild:
Drop dependency on sec-policy/selinux-base-policy as requested by Chris
diff --git a/app-misc/screen/screen-4.0.3.ebuild b/app-misc/screen/screen-4.0.3.ebuild
index 999149124b1f..16385d03acef 100644
--- a/app-misc/screen/screen-4.0.3.ebuild
+++ b/app-misc/screen/screen-4.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3.ebuild,v 1.20 2009/12/12 19:51:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3.ebuild,v 1.21 2010/06/05 19:53:12 vapier Exp $
WANT_AUTOCONF="2.5"
@@ -63,6 +63,10 @@ src_unpack() {
# crosscompile patch
epatch "${FILESDIR}"/"${P}"-crosscompile.patch
+ # sched.h is a system header and causes problems with some C libraries
+ mv sched.h _sched.h || die
+ sed -i '/include/s:sched.h:_sched.h:' screen.h || die
+
# Allow for more rendition (color/attribute) changes in status bars
sed -i \
-e "s:#define MAX_WINMSG_REND 16:#define MAX_WINMSG_REND 64:" \