summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-04-11 20:29:21 +0000
committerMike Frysinger <vapier@gentoo.org>2010-04-11 20:29:21 +0000
commit0985ba0ad15116906816c438e25c1797d13a168e (patch)
tree27a4d22042a5b14b315e64a05159440917f9fc87 /sys-apps/setserial
parentrespect CPPFLAGS (diff)
downloadgentoo-2-0985ba0ad15116906816c438e25c1797d13a168e.tar.gz
gentoo-2-0985ba0ad15116906816c438e25c1797d13a168e.tar.bz2
gentoo-2-0985ba0ad15116906816c438e25c1797d13a168e.zip
Fix building with newer linux-headers where hayes esp no longer exists #309883 by Gary Stein.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/setserial')
-rw-r--r--sys-apps/setserial/ChangeLog9
-rw-r--r--sys-apps/setserial/files/setserial-2.17-hayes-esp.patch15
-rw-r--r--sys-apps/setserial/setserial-2.17-r4.ebuild5
3 files changed, 25 insertions, 4 deletions
diff --git a/sys-apps/setserial/ChangeLog b/sys-apps/setserial/ChangeLog
index eb17da9610ad..6d64a1f317be 100644
--- a/sys-apps/setserial/ChangeLog
+++ b/sys-apps/setserial/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/setserial
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/ChangeLog,v 1.17 2008/05/11 01:50:09 solar Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/ChangeLog,v 1.18 2010/04/11 20:29:21 vapier Exp $
+
+ 11 Apr 2010; Mike Frysinger <vapier@gentoo.org> setserial-2.17-r4.ebuild,
+ +files/setserial-2.17-hayes-esp.patch:
+ Fix building with newer linux-headers where hayes esp no longer exists
+ #309883 by Gary Stein.
11 May 2008; <solar@gentoo.org> setserial-2.17-r4.ebuild:
- cross compile fix
diff --git a/sys-apps/setserial/files/setserial-2.17-hayes-esp.patch b/sys-apps/setserial/files/setserial-2.17-hayes-esp.patch
new file mode 100644
index 000000000000..72783553c214
--- /dev/null
+++ b/sys-apps/setserial/files/setserial-2.17-hayes-esp.patch
@@ -0,0 +1,15 @@
+recent versions of linux have dropped the hayes esp driver
+
+http://bugs.gentoo.org/309883
+
+--- a/setserial.c
++++ b/setserial.c
+@@ -21,6 +21,8 @@
+ #endif
+ #ifdef HAVE_LINUX_HAYESESP_H
+ #include <linux/hayesesp.h>
++#else
++#undef TIOCGHAYESESP
+ #endif
+ #include <linux/serial.h>
+
diff --git a/sys-apps/setserial/setserial-2.17-r4.ebuild b/sys-apps/setserial/setserial-2.17-r4.ebuild
index 33ce0f18f30e..23ad494e2edd 100644
--- a/sys-apps/setserial/setserial-2.17-r4.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/setserial-2.17-r4.ebuild,v 1.2 2008/05/11 01:50:09 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/setserial-2.17-r4.ebuild,v 1.3 2010/04/11 20:29:21 vapier Exp $
inherit eutils toolchain-funcs
@@ -21,6 +21,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-manpage-updates.patch
epatch "${FILESDIR}"/${P}-headers.patch
epatch "${FILESDIR}"/${P}-build.patch
+ epatch "${FILESDIR}"/${P}-hayes-esp.patch #309883
}
src_compile() {