rpms
/
tbb
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebase to TBB 4.1 update 3

This commit is contained in:
Petr Machata 2013-05-22 15:32:02 +02:00
parent 59a27a44f6
commit 7cc476a8d7
5 changed files with 19 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -7,3 +7,6 @@ Getting_Started.pdf
tbb*/
/tbb40_20110809oss_src.tgz
/tbb40_20120408oss_src.tgz
*.rpm
/tbb41_20130314oss_src.tgz
.*.log

1
sources
View File

@ -3,3 +3,4 @@
56f3f5407481402e7653e57525f2c79b Reference.pdf
08d5cbf5d6ba946784aa578b03586c5e Tutorial.pdf
734b356da7fe0ed308741f3e6018251e tbb40_20120408oss_src.tgz
ed4af7ccfa122f16cf9920b241633a3a tbb41_20130314oss_src.tgz

8
tbb-3.0-cxxflags.patch
View File

@ -1,12 +1,12 @@
diff -up tbb30_20110419oss/build/linux.gcc.inc\~ tbb30_20110419oss/build/linux.gcc.inc
--- tbb30_20110419oss/build/linux.gcc.inc~ 2011-04-19 13:48:58.000000000 +0200
+++ tbb30_20110419oss/build/linux.gcc.inc 2011-07-26 14:02:48.482006056 +0200
@@ -51,10 +51,10 @@ C_FLAGS = $(CPLUS_FLAGS)
@@ -59,10 +59,10 @@ ifneq (,$(shell gcc -dumpversion | egrep
endif
ITT_NOTIFY = -DDO_ITT_NOTIFY
ifeq ($(cfg), release)
- CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
+ CPLUS_FLAGS = $(CXXFLAGS) $(ITT_NOTIFY) -O2 -DUSE_PTHREAD
+ CPLUS_FLAGS = $(CXXFLAGS) $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
endif
ifeq ($(cfg), debug)
- CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD
@ -15,4 +15,4 @@ diff -up tbb30_20110419oss/build/linux.gcc.inc\~ tbb30_20110419oss/build/linux.g
ifneq (00,$(lambdas)$(cpp0x))
Diff finished. Tue Jul 26 14:02:54 2011
Diff finished. Tue Feb 26 13:00:13 2013

16
tbb-4.0-cas.patch
View File

@ -1,16 +0,0 @@
diff -up tbb40_20120408oss/include/tbb/tbb_machine.h\~ tbb40_20120408oss/include/tbb/tbb_machine.h
--- tbb40_20120408oss/include/tbb/tbb_machine.h~ 2012-04-20 09:21:57.000000000 +0200
+++ tbb40_20120408oss/include/tbb/tbb_machine.h 2012-08-28 13:20:42.150456167 +0200
@@ -373,8 +373,8 @@ void spin_wait_until_eq( const volatile
// - The operation assumes that the architecture consistently uses either little-endian or big-endian:
// it does not support mixed-endian or page-specific bi-endian architectures.
// This function is the only use of __TBB_BIG_ENDIAN.
-#if (__TBB_BIG_ENDIAN!=-1)
- #if ( __TBB_USE_GENERIC_PART_WORD_CAS)
+#if ( __TBB_USE_GENERIC_PART_WORD_CAS)
+ #if (__TBB_BIG_ENDIAN==-1)
#error generic implementation of part-word CAS was explicitly disabled for this configuration
#endif
template<typename T>
Diff finished. Tue Aug 28 13:20:58 2012

43
tbb.spec
View File

@ -1,7 +1,7 @@
%define releasedate 20120408
%define releasedate 20130314
%define major 4
%define minor 0
%define update 4
%define minor 1
%define update 3
%define dotver %{major}.%{minor}
%define sourcebasename tbb%{major}%{minor}_%{releasedate}oss
@ -10,26 +10,11 @@
Summary: The Threading Building Blocks library abstracts low-level threading details
Name: tbb
Version: %{dotver}
Release: 7.%{releasedate}%{?dist}
Release: 1.%{releasedate}%{?dist}
License: GPLv2 with exceptions
Group: Development/Tools
URL: http://threadingbuildingblocks.org/
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
# what's uploaded anymore.
%define docurl http://threadingbuildingblocks.org/uploads/81/91/Latest%%20Open%%20Source%%20Documentation/
%define source_1 CHANGES.txt
%define source_2 Getting_Started.pdf
%define source_3 Reference.pdf
%define source_4 Tutorial.pdf
%define source_5 Design_Patterns.pdf
Source1: %{docurl}/%{source_1}
Source2: %{docurl}/%{source_2}
Source3: %{docurl}/%{source_3}
Source4: %{docurl}/%{source_4}
Source5: %{docurl}/%{source_5}
Source0: http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb41_20130314oss_src.tgz
# These two are downstream sources.
Source6: tbb.pc
@ -39,13 +24,8 @@ Source8: tbbmalloc_proxy.pc
Patch1: tbb-3.0-cxxflags.patch
Patch2: tbb-4.0-mfence.patch
# http://software.intel.com/en-us/forums/showthread.php?t=106373
Patch3: tbb-4.0-cas.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libstdc++-devel
# We need "arch" and "hostname" binaries:
BuildRequires: util-linux net-tools
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
%description
@ -83,7 +63,6 @@ C++ library.
%setup -q -n %{sourcebasename}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" tbb_build_prefix=obj
@ -91,7 +70,6 @@ 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
rm -rf $RPM_BUILD_ROOT
@ -130,19 +108,20 @@ rm -rf ${RPM_BUILD_ROOT}
%files devel
%defattr(-,root,root,-)
%doc %{source_1}
%doc CHANGES
%{_includedir}/tbb
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%files doc
%defattr(-,root,root,-)
%doc %{source_2}
%doc %{source_3}
%doc %{source_4}
%doc %{source_5}
%doc doc/Release_Notes.txt
%doc doc/html
%changelog
* Wed May 22 2013 Petr Machata <pmachata@redhat.com> - 4.1-1.20130314
- Rebase to 4.1 update 3
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0-7.20120408
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild