diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2009-07-02 15:49:21 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2009-07-02 15:49:21 +0000 |
| commit | aa293b6116cce252c1c3a7faa2fc22ef4afd0824 (patch) | |
| tree | 1253ae8d641a3194c570ea67b420a046e760b9aa /net-libs/libnids | |
| parent | Backported patch. That fixes Gentoo bug #274990 (diff) | |
| download | gentoo-2-aa293b6116cce252c1c3a7faa2fc22ef4afd0824.tar.gz gentoo-2-aa293b6116cce252c1c3a7faa2fc22ef4afd0824.tar.bz2 gentoo-2-aa293b6116cce252c1c3a7faa2fc22ef4afd0824.zip | |
Fix compiling with gcc 4.4 (bug #276239).
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'net-libs/libnids')
| -rw-r--r-- | net-libs/libnids/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/libnids/files/libnids-1.23-elif.patch | 10 | ||||
| -rw-r--r-- | net-libs/libnids/libnids-1.23-r1.ebuild | 5 |
3 files changed, 18 insertions, 3 deletions
diff --git a/net-libs/libnids/ChangeLog b/net-libs/libnids/ChangeLog index 88277a813997..d492a1540bee 100644 --- a/net-libs/libnids/ChangeLog +++ b/net-libs/libnids/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/libnids # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.32 2009/05/29 17:06:54 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/ChangeLog,v 1.33 2009/07/02 15:49:21 jer Exp $ + + 02 Jul 2009; Jeroen Roovers <jer@gentoo.org> libnids-1.23-r1.ebuild, + +files/libnids-1.23-elif.patch: + Fix compiling with gcc 4.4 (bug #276239). 29 May 2009; Steve Dibb <beandog@gentoo.org> libnids-1.18.ebuild: amd64 stable diff --git a/net-libs/libnids/files/libnids-1.23-elif.patch b/net-libs/libnids/files/libnids-1.23-elif.patch new file mode 100644 index 000000000000..30408dca0f27 --- /dev/null +++ b/net-libs/libnids/files/libnids-1.23-elif.patch @@ -0,0 +1,10 @@ +--- libnids-1.23/src/killtcp.c.orig 2006-05-08 22:05:51.000000000 +0200 ++++ libnids-1.23/src/killtcp.c 2009-07-02 17:42:29.000000000 +0200 +@@ -118,6 +118,6 @@ + if (initialized) + abort(); + } +-#elif ++#else + #error Something wrong with LIBNET_VER + #endif diff --git a/net-libs/libnids/libnids-1.23-r1.ebuild b/net-libs/libnids/libnids-1.23-r1.ebuild index ab7c9719802d..89ee76c4dfa6 100644 --- a/net-libs/libnids/libnids-1.23-r1.ebuild +++ b/net-libs/libnids/libnids-1.23-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/net-libs/libnids/libnids-1.23-r1.ebuild,v 1.1 2009/03/23 19:47:12 rbu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libnids/libnids-1.23-r1.ebuild,v 1.2 2009/07/02 15:49:21 jer Exp $ EAPI=2 inherit eutils @@ -20,7 +20,8 @@ RDEPEND="${DEPEND} !net-libs/libnids:1.1" src_prepare() { - epatch "${FILESDIR}"/${PN}-1.20-chksum.c-ebx.patch + epatch "${FILESDIR}/${PN}-1.20-chksum.c-ebx.patch" + epatch "${FILESDIR}/${P}-elif.patch" } src_configure() { |