diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2012-11-03 08:41:23 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2012-11-03 08:41:23 +0000 |
| commit | 79369072c745854561f2d9586c63598f7b6dd628 (patch) | |
| tree | 1cab14e4136b3465240926212db0b491d56e9513 /net-analyzer/cbm | |
| parent | http://my.opera.com/desktopteam/blog/2012/11/02/opera-12-10-rc3 (diff) | |
| download | gentoo-2-79369072c745854561f2d9586c63598f7b6dd628.tar.gz gentoo-2-79369072c745854561f2d9586c63598f7b6dd628.tar.bz2 gentoo-2-79369072c745854561f2d9586c63598f7b6dd628.zip | |
Fix building with GCC 4.7 wrt bug #441030. Thanks to Diego Elio Pettenò for discovering this issue
(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-analyzer/cbm')
| -rw-r--r-- | net-analyzer/cbm/ChangeLog | 7 | ||||
| -rw-r--r-- | net-analyzer/cbm/cbm-0.1.ebuild | 7 | ||||
| -rw-r--r-- | net-analyzer/cbm/files/cbm-gcc-4.7.patch | 10 |
3 files changed, 21 insertions, 3 deletions
diff --git a/net-analyzer/cbm/ChangeLog b/net-analyzer/cbm/ChangeLog index 1be3906adb4d..c69b4b6f2682 100644 --- a/net-analyzer/cbm/ChangeLog +++ b/net-analyzer/cbm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/cbm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cbm/ChangeLog,v 1.1 2012/10/23 11:52:16 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cbm/ChangeLog,v 1.2 2012/11/03 08:41:23 pinkbyte Exp $ + + 03 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> cbm-0.1.ebuild, + +files/cbm-gcc-4.7.patch: + Fix building with GCC 4.7 wrt bug #441030. Thanks to Diego Elio Pettenò for + discovering this issue *cbm-0.1 (23 Oct 2012) diff --git a/net-analyzer/cbm/cbm-0.1.ebuild b/net-analyzer/cbm/cbm-0.1.ebuild index 86b178c1cc94..bc0b533f800f 100644 --- a/net-analyzer/cbm/cbm-0.1.ebuild +++ b/net-analyzer/cbm/cbm-0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cbm/cbm-0.1.ebuild,v 1.1 2012/10/23 11:52:16 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cbm/cbm-0.1.ebuild,v 1.2 2012/11/03 08:41:23 pinkbyte Exp $ EAPI=4 @@ -20,4 +20,7 @@ DEPEND="${RDEPEND} app-text/xmlto app-text/docbook-xml-dtd:4.4" -PATCHES=( "${FILESDIR}/${PN}-gcc-4.3.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-gcc-4.3.patch" + "${FILESDIR}/${PN}-gcc-4.7.patch" + ) diff --git a/net-analyzer/cbm/files/cbm-gcc-4.7.patch b/net-analyzer/cbm/files/cbm-gcc-4.7.patch new file mode 100644 index 000000000000..8f3acbed9819 --- /dev/null +++ b/net-analyzer/cbm/files/cbm-gcc-4.7.patch @@ -0,0 +1,10 @@ +--- src/cbm.cpp.orig 2012-11-03 12:36:00.305615930 +0400 ++++ src/cbm.cpp 2012-11-03 12:36:10.920615253 +0400 +@@ -18,6 +18,7 @@ + #include <sys/socket.h> + #include <arpa/inet.h> + #include <net/if.h> ++#include <unistd.h> + + // Externs + extern int optind, opterr, optopt; |