Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/opencv: opencv-2.4.7.ebuild ChangeLog
Date: Sat, 07 Dec 2013 14:31:04
Message-Id: 20131207143101.3662C2004B@flycatcher.gentoo.org
1 dilfridge 13/12/07 14:31:01
2
3 Modified: opencv-2.4.7.ebuild ChangeLog
4 Log:
5 Fix build without openmp, bug 493530
6
7 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
8
9 Revision Changes Path
10 1.2 media-libs/opencv/opencv-2.4.7.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.7.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.7.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/opencv-2.4.7.ebuild?r1=1.1&r2=1.2
15
16 Index: opencv-2.4.7.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.7.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- opencv-2.4.7.ebuild 7 Dec 2013 00:20:15 -0000 1.1
23 +++ opencv-2.4.7.ebuild 7 Dec 2013 14:31:01 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2013 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.7.ebuild,v 1.1 2013/12/07 00:20:15 dilfridge Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.7.ebuild,v 1.2 2013/12/07 14:31:01 dilfridge Exp $
29
30 EAPI=5
31 PYTHON_DEPEND="2:2.6"
32 @@ -86,7 +86,9 @@
33 }
34
35 src_configure() {
36 - use openmp && tc-has-openmp || die "Please switch to an openmp compatible compiler"
37 + if use openmp; then
38 + tc-has-openmp || die "Please switch to an openmp compatible compiler"
39 + fi
40
41 JAVA_ANT_ENCODING="iso-8859-1"
42 # set encoding so even this cmake build will pick it up.
43
44
45
46 1.104 media-libs/opencv/ChangeLog
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.104&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?rev=1.104&content-type=text/plain
50 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencv/ChangeLog?r1=1.103&r2=1.104
51
52 Index: ChangeLog
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v
55 retrieving revision 1.103
56 retrieving revision 1.104
57 diff -u -r1.103 -r1.104
58 --- ChangeLog 7 Dec 2013 00:20:15 -0000 1.103
59 +++ ChangeLog 7 Dec 2013 14:31:01 -0000 1.104
60 @@ -1,6 +1,9 @@
61 # ChangeLog for media-libs/opencv
62 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
63 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.103 2013/12/07 00:20:15 dilfridge Exp $
64 +# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.104 2013/12/07 14:31:01 dilfridge Exp $
65 +
66 + 07 Dec 2013; Andreas K. Huettel <dilfridge@g.o> opencv-2.4.7.ebuild:
67 + Fix build without openmp, bug 493530
68
69 *opencv-2.4.7 (07 Dec 2013)