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