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