diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-03-06 17:27:03 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-03-06 17:27:03 +0000 |
| commit | 659562d9e6a82cd4a10c4d559da9c47d6fa871e0 (patch) | |
| tree | de41e8af1dc92a9bb9ab69e56121e155d9351987 /net-misc/bridge-utils | |
| parent | Dev channel bump. Remove old. (diff) | |
| download | gentoo-2-659562d9e6a82cd4a10c4d559da9c47d6fa871e0.tar.gz gentoo-2-659562d9e6a82cd4a10c4d559da9c47d6fa871e0.tar.bz2 gentoo-2-659562d9e6a82cd4a10c4d559da9c47d6fa871e0.zip | |
Unfortunately linux/if_bridge.h is not self-contained and struct for ip6 is in netinet/ip6.h (since Linux 3.8+) wrt #460262 by Guillaume Castagnino
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'net-misc/bridge-utils')
| -rw-r--r-- | net-misc/bridge-utils/ChangeLog | 9 | ||||
| -rw-r--r-- | net-misc/bridge-utils/bridge-utils-1.5.ebuild | 16 | ||||
| -rw-r--r-- | net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch | 18 |
3 files changed, 33 insertions, 10 deletions
diff --git a/net-misc/bridge-utils/ChangeLog b/net-misc/bridge-utils/ChangeLog index a59f22fa94ff..629f116c1ab4 100644 --- a/net-misc/bridge-utils/ChangeLog +++ b/net-misc/bridge-utils/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/bridge-utils -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.58 2012/05/19 15:05:35 blueness Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.59 2013/03/06 17:27:03 ssuominen Exp $ + + 06 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> bridge-utils-1.5.ebuild, + +files/bridge-utils-1.5-linux-3.8.patch: + Unfortunately linux/if_bridge.h is not self-contained and struct for ip6 is + in netinet/ip6.h (since Linux 3.8+) wrt #460262 by Guillaume Castagnino 19 May 2012; Anthony G. Basile <blueness@gentoo.org> bridge-utils-1.5.ebuild: keyword mips, bug #405835 diff --git a/net-misc/bridge-utils/bridge-utils-1.5.ebuild b/net-misc/bridge-utils/bridge-utils-1.5.ebuild index 53c95f915a73..1bfeb5731881 100644 --- a/net-misc/bridge-utils/bridge-utils-1.5.ebuild +++ b/net-misc/bridge-utils/bridge-utils-1.5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-1.5.ebuild,v 1.2 2012/05/19 15:05:35 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-1.5.ebuild,v 1.3 2013/03/06 17:27:03 ssuominen Exp $ -EAPI="3" +EAPI="5" inherit autotools eutils linux-info toolchain-funcs @@ -29,6 +29,7 @@ get_headers() { } src_prepare() { + epatch "${FILESDIR}"/${P}-linux-3.8.patch eautoreconf } @@ -38,12 +39,11 @@ src_configure() { --prefix=/ \ --libdir=/usr/$(get_libdir) \ --includedir=/usr/include \ - --with-linux-headers="$(get_headers)" \ - || die "econf failed" + --with-linux-headers="$(get_headers)" } src_install () { - emake install DESTDIR="${D}" || die "make install failed" - dodoc AUTHORS ChangeLog README THANKS TODO - dodoc doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} + emake install DESTDIR="${D}" + dodoc AUTHORS ChangeLog README THANKS TODO \ + doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} } diff --git a/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch b/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch new file mode 100644 index 000000000000..49ebb4e9da28 --- /dev/null +++ b/net-misc/bridge-utils/files/bridge-utils-1.5-linux-3.8.patch @@ -0,0 +1,18 @@ +unfortunately if_bridge.h from Linux 3.8+ is not self-contained and the struct +for ip6 is missing + +http://bugs.gentoo.org/460262 + +this is not unheard of with Linux headers, for example, <linux/cdrom.h> needs +<limits.h> to get INT_MAX + +--- libbridge/libbridge.h ++++ libbridge/libbridge.h +@@ -20,6 +20,7 @@ + #define _LIBBRIDGE_H + + #include <sys/socket.h> ++#include <netinet/ip6.h> + #include <linux/if.h> + #include <linux/if_bridge.h> + |