Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-cpp/tbb: ChangeLog tbb-3.0.221.ebuild
Date: Tue, 02 Aug 2011 17:17:40
Message-Id: 20110802171730.4E1802004C@flycatcher.gentoo.org
1 bicatali 11/08/02 17:17:30
2
3 Modified: ChangeLog
4 Added: tbb-3.0.221.ebuild
5 Log:
6 Version bump, switched to EAPI4
7
8 (Portage version: 2.1.10.9/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.13 dev-cpp/tbb/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/ChangeLog?rev=1.13&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/ChangeLog?rev=1.13&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/ChangeLog?r1=1.12&r2=1.13
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v
20 retrieving revision 1.12
21 retrieving revision 1.13
22 diff -u -r1.12 -r1.13
23 --- ChangeLog 31 May 2011 21:34:13 -0000 1.12
24 +++ ChangeLog 2 Aug 2011 17:17:30 -0000 1.13
25 @@ -1,6 +1,11 @@
26 # ChangeLog for dev-cpp/tbb
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.12 2011/05/31 21:34:13 bicatali Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.13 2011/08/02 17:17:30 bicatali Exp $
30 +
31 +*tbb-3.0.221 (02 Aug 2011)
32 +
33 + 02 Aug 2011; Sébastien Fabbro <bicatali@g.o> +tbb-3.0.221.ebuild:
34 + Version bump, switched to EAPI4
35
36 *tbb-3.0.196 (31 May 2011)
37
38
39
40
41 1.1 dev-cpp/tbb/tbb-3.0.221.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/tbb-3.0.221.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/tbb-3.0.221.ebuild?rev=1.1&content-type=text/plain
45
46 Index: tbb-3.0.221.ebuild
47 ===================================================================
48 # Copyright 1999-2011 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-3.0.221.ebuild,v 1.1 2011/08/02 17:17:30 bicatali Exp $
51
52 EAPI=4
53 inherit eutils versionator toolchain-funcs
54
55 # those 2 below change pretty much every release
56 # url number
57 MYU="78/172"
58 # release update
59 MYR="%20update%208"
60
61 PV1="$(get_version_component_range 1)"
62 PV2="$(get_version_component_range 2)"
63 PV3="$(get_version_component_range 3)"
64 MYP="${PN}${PV1}${PV2}_${PV3}oss"
65
66 DESCRIPTION="High level abstract threading library"
67 HOMEPAGE="http://www.threadingbuildingblocks.org/"
68 SRC_URI="http://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}${MYR}/${MYP}_src.tgz"
69 LICENSE="GPL-2-with-exceptions"
70
71 SLOT="0"
72 KEYWORDS="~amd64 ~x86"
73 IUSE="debug doc examples"
74
75 DEPEND="!<=dev-cpp/tbb-2.1.016"
76 RDEPEND="${DEPEND}"
77 S="${WORKDIR}/${MYP}"
78
79 src_prepare() {
80 epatch "${FILESDIR}"/${PN}-3.0.104-tests.patch
81 # use fully qualified compilers. do not force pentium4 for x86 users
82 local CC="$(tc-getCC)"
83 sed -i \
84 -e "s/-O2/${CXXFLAGS}/g" \
85 -e 's/^\(CPLUS = \)g++ $/\1'"$(tc-getCXX)/" \
86 -e 's/^\(CONLY = \)gcc$/\1'"${CC}/" \
87 -e 's/\(shell \)gcc\( --version\)/\1'"${CC}"'\2/' \
88 -e '/CPLUS_FLAGS +=/s/-march=pentium4//' \
89 build/*.inc || die
90 # - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the
91 # actual command.
92 # - Force generation of version_string.tmp immediately after the directory
93 # is created. This avoids a race when the user builds tbb and tbbmalloc
94 # concurrently. The choice of Makefile.tbb (instead of
95 # Makefile.tbbmalloc) is arbitrary.
96 sed -i \
97 -e 's/^\t\$(shell \(.*\) >\$(NUL) 2>\$(NUL))\s*/\t\1/' \
98 -e 's!^\t@echo Created \$(work_dir)_\(debug\|release\).*$!&\n\t$(MAKE) -C "$(work_dir)_\1" -r -f $(tbb_root)/build/Makefile.tbb cfg=\1 tbb_root=$(tbb_root) version_string.tmp!' \
99 src/Makefile || die
100 }
101
102 src_compile() {
103 if [[ $(tc-getCXX) == *g++ ]]; then
104 myconf="compiler=gcc"
105 elif [[ $(tc-getCXX) == *ic*c ]]; then
106 myconf="compiler=icc"
107 fi
108 local ccconf="${myconf}"
109 if use debug || use examples; then
110 ccconf="${ccconf} tbb_debug tbbmalloc_debug"
111 fi
112 emake -C src ${ccconf} tbb_release tbbmalloc_release
113 }
114
115 src_test() {
116 local ccconf="${myconf}"
117 if use debug || use examples; then
118 ${ccconf}="${myconf} test_debug tbbmalloc_test_debug"
119 fi
120 emake -C src ${ccconf} test_release
121 }
122
123 src_install(){
124 for l in $(find build -name lib\*.so.\*); do
125 dolib.so ${l}
126 local bl=$(basename ${l})
127 dosym ${bl} /usr/$(get_libdir)/${bl%.*}
128 done
129 insinto /usr
130 doins -r include
131
132 dodoc README CHANGES doc/Release_Notes.txt
133 use doc && dohtml -r doc/html/*
134
135 if use examples ; then
136 insinto /usr/share/doc/${PF}/examples/build
137 doins build/*.inc
138 insinto /usr/share/doc/${PF}/examples
139 doins -r examples
140 fi
141 }