diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-07-25 20:16:33 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-25 20:16:33 +0000 |
| commit | c254ba3b0afce3a59a4c286264e30de94d50d66f (patch) | |
| tree | 8ae5997ebca81ff73247756b82d619cef3b479d1 | |
| parent | Fix building with GCC 4.4 wrt #278079. (diff) | |
| download | gentoo-2-c254ba3b0afce3a59a4c286264e30de94d50d66f.tar.gz gentoo-2-c254ba3b0afce3a59a4c286264e30de94d50d66f.tar.bz2 gentoo-2-c254ba3b0afce3a59a4c286264e30de94d50d66f.zip | |
Fix building with GCC 4.4 wrt #274261.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
| -rw-r--r-- | media-libs/opencv/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/opencv/files/opencv-1.0.0-gcc44.patch | 12 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-1.0.0-r1.ebuild | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog index 4d663fb41bff..5302c9ee4119 100644 --- a/media-libs/opencv/ChangeLog +++ b/media-libs/opencv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/opencv # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.12 2009/03/02 18:48:03 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.13 2009/07/25 20:16:33 ssuominen Exp $ + + 25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> + opencv-1.0.0-r1.ebuild, +files/opencv-1.0.0-gcc44.patch: + Fix building with GCC 4.4 wrt #274261. 02 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org> opencv-1.0.0-r1.ebuild: diff --git a/media-libs/opencv/files/opencv-1.0.0-gcc44.patch b/media-libs/opencv/files/opencv-1.0.0-gcc44.patch new file mode 100644 index 000000000000..be7e67916b65 --- /dev/null +++ b/media-libs/opencv/files/opencv-1.0.0-gcc44.patch @@ -0,0 +1,12 @@ +diff -ur opencv-1.0.0.orig/cxcore/include/cxmisc.h opencv-1.0.0/cxcore/include/cxmisc.h +--- opencv-1.0.0.orig/cxcore/include/cxmisc.h 2006-05-04 18:55:17.000000000 +0300 ++++ opencv-1.0.0/cxcore/include/cxmisc.h 2009-07-25 23:13:51.000000000 +0300 +@@ -130,7 +130,7 @@ + #include <alloca.h> + #elif defined HAVE_ALLOCA + #include <stdlib.h> +-#elif ++#else + #error + #endif + diff --git a/media-libs/opencv/opencv-1.0.0-r1.ebuild b/media-libs/opencv/opencv-1.0.0-r1.ebuild index 65d912ea43b4..903601809dd5 100644 --- a/media-libs/opencv/opencv-1.0.0-r1.ebuild +++ b/media-libs/opencv/opencv-1.0.0-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/media-libs/opencv/opencv-1.0.0-r1.ebuild,v 1.7 2009/03/02 18:48:03 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-1.0.0-r1.ebuild,v 1.8 2009/07/25 20:16:33 ssuominen Exp $ EAPI="1" inherit eutils flag-o-matic autotools @@ -35,6 +35,7 @@ RDEPEND="${COMMON_DEPEND}" src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/${P}-gcc44.patch # remove the install-hook that runs ldconfig. sed -i '/install-hook:/,/^$/d' Makefile.am |