1 |
bicatali 12/11/30 20:37:31 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: tbb-4.1.20121003.ebuild |
5 |
Log: |
6 |
Version bump. Now installs tbbmalloc_proxy library. Simplified the ebuild for better maintainability and better propagation of toolchain |
7 |
|
8 |
(Portage version: 2.2.01.21313-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
9 |
|
10 |
Revision Changes Path |
11 |
1.3 dev-cpp/tbb/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/metadata.xml?rev=1.3&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/metadata.xml?rev=1.3&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/metadata.xml?r1=1.2&r2=1.3 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/tbb/metadata.xml,v |
20 |
retrieving revision 1.2 |
21 |
retrieving revision 1.3 |
22 |
diff -u -r1.2 -r1.3 |
23 |
--- metadata.xml 23 Sep 2011 22:04:26 -0000 1.2 |
24 |
+++ metadata.xml 30 Nov 2012 20:37:31 -0000 1.3 |
25 |
@@ -10,8 +10,5 @@ |
26 |
threading expert. It represents a higher-level, task-based |
27 |
parallelism that abstracts platform details and threading mechanism |
28 |
for performance and scalability. |
29 |
- The Gentoo package installs the commercially aligned release since |
30 |
- it seemed to be more stable and with as many features as the stable |
31 |
- one. |
32 |
</longdescription> |
33 |
</pkgmetadata> |
34 |
|
35 |
|
36 |
|
37 |
1.27 dev-cpp/tbb/ChangeLog |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/ChangeLog?rev=1.27&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/ChangeLog?rev=1.27&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/ChangeLog?r1=1.26&r2=1.27 |
42 |
|
43 |
Index: ChangeLog |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v |
46 |
retrieving revision 1.26 |
47 |
retrieving revision 1.27 |
48 |
diff -u -r1.26 -r1.27 |
49 |
--- ChangeLog 13 Sep 2012 22:37:22 -0000 1.26 |
50 |
+++ ChangeLog 30 Nov 2012 20:37:31 -0000 1.27 |
51 |
@@ -1,6 +1,13 @@ |
52 |
# ChangeLog for dev-cpp/tbb |
53 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.26 2012/09/13 22:37:22 bicatali Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/ChangeLog,v 1.27 2012/11/30 20:37:31 bicatali Exp $ |
56 |
+ |
57 |
+*tbb-4.1.20121003 (30 Nov 2012) |
58 |
+ |
59 |
+ 30 Nov 2012; Sébastien Fabbro <bicatali@g.o> +tbb-4.1.20121003.ebuild, |
60 |
+ metadata.xml: |
61 |
+ Version bump. Now installs tbbmalloc_proxy library. Simplified the ebuild for |
62 |
+ better maintainability and better propagation of toolchain |
63 |
|
64 |
*tbb-4.1.20120718 (13 Sep 2012) |
65 |
|
66 |
|
67 |
|
68 |
|
69 |
1.1 dev-cpp/tbb/tbb-4.1.20121003.ebuild |
70 |
|
71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003.ebuild?rev=1.1&view=markup |
72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003.ebuild?rev=1.1&content-type=text/plain |
73 |
|
74 |
Index: tbb-4.1.20121003.ebuild |
75 |
=================================================================== |
76 |
# Copyright 1999-2012 Gentoo Foundation |
77 |
# Distributed under the terms of the GNU General Public License v2 |
78 |
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003.ebuild,v 1.1 2012/11/30 20:37:31 bicatali Exp $ |
79 |
|
80 |
EAPI=4 |
81 |
inherit eutils flag-o-matic multilib versionator toolchain-funcs |
82 |
|
83 |
PV1="$(get_version_component_range 1)" |
84 |
PV2="$(get_version_component_range 2)" |
85 |
PV3="$(get_version_component_range 3)" |
86 |
MYP="${PN}${PV1}${PV2}_${PV3}oss" |
87 |
|
88 |
DESCRIPTION="High level abstract threading library" |
89 |
HOMEPAGE="http://www.threadingbuildingblocks.org/" |
90 |
SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz" |
91 |
LICENSE="GPL-2-with-exceptions" |
92 |
|
93 |
SLOT="0" |
94 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
95 |
IUSE="debug doc examples" |
96 |
|
97 |
DEPEND="" |
98 |
RDEPEND="${DEPEND}" |
99 |
S="${WORKDIR}/${MYP}" |
100 |
|
101 |
src_prepare() { |
102 |
epatch "${FILESDIR}"/${PN}-4.0.297-underlinking.patch |
103 |
# use fully qualified gcc compilers. do not force march/mcpu |
104 |
# not tested with icc |
105 |
# order in sed expressions is important |
106 |
sed -i \ |
107 |
-e "s/g++/$(tc-getCXX)/g" \ |
108 |
-e "s/gcc/$(tc-getCC)/g" \ |
109 |
-e 's/-m\(arch\|cpu\)=*[[:space:]]//g' \ |
110 |
-e 's/-\(m\|-\)\(64\|32\)//g' \ |
111 |
-e 's/-O2/$(CXXFLAGS)/g' \ |
112 |
-e "/^ASM/s/as/$(tc-getAS)/g" \ |
113 |
build/*.gcc.inc || die |
114 |
|
115 |
find include -name \*.html -delete || die |
116 |
|
117 |
# pc files are for debian and fedora compatibility |
118 |
# some deps use them |
119 |
cat <<-EOF > ${PN}.pc.template |
120 |
prefix=${EPREFIX}/usr |
121 |
libdir=\${prefix}/$(get_libdir) |
122 |
includedir=\${prefix}/include |
123 |
Name: ${PN} |
124 |
Description: ${DESCRIPTION} |
125 |
Version: ${PV} |
126 |
URL: ${HOMEPAGE} |
127 |
Cflags: -I\${includedir} |
128 |
EOF |
129 |
cp ${PN}.pc.template ${PN}.pc |
130 |
cat <<-EOF >> ${PN}.pc |
131 |
Libs: -L\${libdir} -ltbb |
132 |
Libs.private: -lm -lrt |
133 |
EOF |
134 |
cp ${PN}.pc.template ${PN}malloc.pc |
135 |
cat <<-EOF >> ${PN}malloc.pc |
136 |
Libs: -L\${libdir} -ltbbmalloc |
137 |
Libs.private: -lm -lrt |
138 |
EOF |
139 |
cp ${PN}.pc.template ${PN}malloc_proxy.pc |
140 |
cat <<-EOF >> ${PN}malloc_proxy.pc |
141 |
Libs: -L\${libdir} -ltbbmalloc_proxy |
142 |
Libs.private: -lrt |
143 |
Requires: tbbmalloc |
144 |
EOF |
145 |
use debug || sed -i -e '/_debug/d' Makefile |
146 |
} |
147 |
|
148 |
src_compile() { |
149 |
if [[ $(tc-getCXX) == *g++ ]]; then |
150 |
comp="gcc" |
151 |
elif [[ $(tc-getCXX) == *ic*c ]]; then |
152 |
comp="icc" |
153 |
else |
154 |
die "compiler $(tc-getCXX) not supported by build system" |
155 |
fi |
156 |
emake compiler=${comp} tbb tbbmalloc |
157 |
} |
158 |
|
159 |
src_test() { |
160 |
append-cxxflags -fabi-version=4 |
161 |
# avoid oversubscribing with -j1 |
162 |
emake -j1 compiler=${comp} test |
163 |
} |
164 |
|
165 |
src_install(){ |
166 |
local l |
167 |
for l in $(find build -name lib\*.so.\*); do |
168 |
dolib.so ${l} |
169 |
local bl=$(basename ${l}) |
170 |
dosym ${bl} /usr/$(get_libdir)/${bl%.*} |
171 |
done |
172 |
insinto /usr |
173 |
doins -r include |
174 |
|
175 |
insinto /usr/$(get_libdir)/pkgconfig |
176 |
doins *.pc |
177 |
|
178 |
dodoc README CHANGES doc/Release_Notes.txt |
179 |
use doc && dohtml -r doc/html/* |
180 |
|
181 |
if use examples ; then |
182 |
insinto /usr/share/doc/${PF}/examples/build |
183 |
doins build/*.inc |
184 |
insinto /usr/share/doc/${PF}/examples |
185 |
doins -r examples |
186 |
fi |
187 |
} |