Petr Machata
parent
89710d5275
commit
657e0b6918
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@ Getting_Started.pdf
|
||||
/Design_Patterns.pdf
|
||||
tbb*/
|
||||
/tbb40_20110809oss_src.tgz
|
||||
/tbb40_20120408oss_src.tgz
|
||||
|
||||
2364
CHANGES.txt
2364
CHANGES.txt
File diff suppressed because it is too large
Load Diff
8
sources
8
sources
@ -1,5 +1,5 @@
|
||||
c3c66663c10261ff03d1b071ab74e659 tbb40_20110809oss_src.tgz
|
||||
683109a2b732ecd56185d9019667718f Design_Patterns.pdf
|
||||
907eed2e81e0d29a93848a26e0fbfa5d Getting_Started.pdf
|
||||
131f0f2ae4311794dfa37b7a9172c54e Reference.pdf
|
||||
74fca4778a2c624631c157b07beab7ec Tutorial.pdf
|
||||
6c2a2838cdaf55f7af57788d97b43b8b Getting_Started.pdf
|
||||
56f3f5407481402e7653e57525f2c79b Reference.pdf
|
||||
08d5cbf5d6ba946784aa578b03586c5e Tutorial.pdf
|
||||
734b356da7fe0ed308741f3e6018251e tbb40_20120408oss_src.tgz
|
||||
|
||||
@ -5,7 +5,7 @@ diff -up tbb30_20110419oss/build/linux.gcc.inc\~ tbb30_20110419oss/build/linux.g
|
||||
|
||||
ITT_NOTIFY = -DDO_ITT_NOTIFY
|
||||
ifeq ($(cfg), release)
|
||||
- CPLUS_FLAGS = $(ITT_NOTIFY) -O2 -DUSE_PTHREAD
|
||||
- CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
|
||||
+ CPLUS_FLAGS = $(CXXFLAGS) $(ITT_NOTIFY) -O2 -DUSE_PTHREAD
|
||||
endif
|
||||
ifeq ($(cfg), debug)
|
||||
@ -13,6 +13,6 @@ diff -up tbb30_20110419oss/build/linux.gcc.inc\~ tbb30_20110419oss/build/linux.g
|
||||
+ CPLUS_FLAGS = $(CXXFLAGS) -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
|
||||
endif
|
||||
|
||||
ifneq (0,$(cpp0x))
|
||||
ifneq (00,$(lambdas)$(cpp0x))
|
||||
|
||||
Diff finished. Tue Jul 26 14:02:54 2011
|
||||
|
||||
5
tbb.pc
Normal file
5
tbb.pc
Normal file
@ -0,0 +1,5 @@
|
||||
Name: Threading Building Blocks
|
||||
Description: The Threading Building Blocks library abstracts low-level threading details
|
||||
URL: http://www.threadingbuildingblocks.org/
|
||||
Version: _FEDORA_VERSION
|
||||
Libs: -ltbb
|
||||
32
tbb.spec
32
tbb.spec
@ -1,18 +1,20 @@
|
||||
%define releasedate 20110809
|
||||
%define releasedate 20120408
|
||||
%define major 4
|
||||
%define minor 0
|
||||
%define update 4
|
||||
%define dotver %{major}.%{minor}
|
||||
%define sourcebasename tbb%{major}%{minor}_%{releasedate}oss
|
||||
|
||||
%define sourcefilename %{sourcebasename}_src.tgz
|
||||
|
||||
Summary: The Threading Building Blocks library abstracts low-level threading details
|
||||
Name: tbb
|
||||
Version: %{dotver}
|
||||
Release: 3.%{releasedate}%{?dist}
|
||||
Release: 4.%{releasedate}%{?dist}
|
||||
License: GPLv2 with exceptions
|
||||
Group: Development/Tools
|
||||
URL: http://threadingbuildingblocks.org/
|
||||
Source0: http://threadingbuildingblocks.org/uploads/77/175/4.0/tbb40_20110809oss_src.tgz
|
||||
Source0: http://threadingbuildingblocks.org/uploads/77/185/4.0%%20update%%204/tbb40_20120408oss_src.tgz
|
||||
|
||||
# Upstream regularly replaces the "Latest" documentation with what's
|
||||
# actually Latest at that point. These sources may no longer match
|
||||
@ -29,6 +31,11 @@ Source3: %{docurl}/%{source_3}
|
||||
Source4: %{docurl}/%{source_4}
|
||||
Source5: %{docurl}/%{source_5}
|
||||
|
||||
# These two are downstream sources.
|
||||
Source6: tbb.pc
|
||||
Source7: tbbmalloc.pc
|
||||
Source8: tbbmalloc_proxy.pc
|
||||
|
||||
Patch1: tbb-3.0-cxxflags.patch
|
||||
Patch2: tbb-4.0-mfence.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -75,7 +82,10 @@ C++ library.
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" tbb_build_prefix=obj
|
||||
|
||||
for file in %{SOURCE6} %{SOURCE7} %{SOURCE8}; do
|
||||
sed 's/_FEDORA_VERSION/%{major}.%{minor}.%{update}/' ${file} \
|
||||
> $(basename ${file})
|
||||
done
|
||||
cp -p "%{SOURCE1}" "%{SOURCE2}" "%{SOURCE3}" "%{SOURCE4}" "%{SOURCE5}" .
|
||||
|
||||
%install
|
||||
@ -84,7 +94,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_includedir}
|
||||
|
||||
pushd build/obj_release
|
||||
for file in libtbb{,malloc}; do
|
||||
for file in libtbb{,malloc{,_proxy}}; do
|
||||
install -p -D -m 755 ${file}.so.2 $RPM_BUILD_ROOT/%{_libdir}
|
||||
ln -s $file.so.2 $RPM_BUILD_ROOT/%{_libdir}/$file.so
|
||||
done
|
||||
@ -96,6 +106,11 @@ pushd include
|
||||
\;
|
||||
popd
|
||||
|
||||
for file in %{SOURCE6} %{SOURCE7} %{SOURCE8}; do
|
||||
install -p -D -m 644 $(basename ${file}) \
|
||||
$RPM_BUILD_ROOT/%{_libdir}/pkgconfig/$(basename ${file})
|
||||
done
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
@ -113,6 +128,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%doc %{source_1}
|
||||
%{_includedir}/tbb
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
@ -122,6 +138,12 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%doc %{source_5}
|
||||
|
||||
%changelog
|
||||
* Thu Jun 7 2012 Petr Machata <pmachata@redhat.com> - 4.0-4.20120408
|
||||
- Rebase to 4.0 update 4
|
||||
- Refresh Getting_Started.pdf, Reference.pdf, Tutorial.pdf
|
||||
- Provide pkg-config files
|
||||
- Resolves: #825402
|
||||
|
||||
* Thu Apr 05 2012 Karsten Hopp <karsten@redhat.com> 4.0-3.20110809
|
||||
- tbb builds now on PPC(64)
|
||||
|
||||
|
||||
5
tbbmalloc.pc
Normal file
5
tbbmalloc.pc
Normal file
@ -0,0 +1,5 @@
|
||||
Name: Threading Building Blocks Scalable Allocator
|
||||
Description: Implementation of Scalable Memory Allocator of Threading Building Blocks
|
||||
URL: http://www.threadingbuildingblocks.org/
|
||||
Version: _FEDORA_VERSION
|
||||
Libs: -ltbbmalloc
|
||||
5
tbbmalloc_proxy.pc
Normal file
5
tbbmalloc_proxy.pc
Normal file
@ -0,0 +1,5 @@
|
||||
Name: Threading Building Blocks Scallable Malloc Proxy
|
||||
Description: Implementation of proxy that redirects memory allocation calls to TBB Scalable Memory Allocator
|
||||
URL: http://www.threadingbuildingblocks.org/
|
||||
Version: _FEDORA_VERSION
|
||||
Libs: -ltbbmalloc_proxy
|
||||
Loading…
Reference in New Issue
Block a user