pool/tbb
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 130974 from home:chenxiaolong:SABnzbd

Browse Source 
Update to latest version and include internal headers as some packages need them to compile properly.

OBS-URL: https://build.opensuse.org/request/show/130974
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tbb?expand=0&rev=4
This commit is contained in:
Cristian Rodríguez 2012-08-16 05:49:42 +00:00 committed by Git OBS Bridge
parent 7c38534d5c
commit 0268ddae8b
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
optflags.patch
View File

@ -1,6 +1,6 @@
--- build/linux.gcc.inc.orig --- build/linux.gcc.inc.orig 2012-08-15 17:41:48.445365711 -0400
+++ build/linux.gcc.inc +++ build/linux.gcc.inc 2012-08-15 17:41:20.025343809 -0400
@@ -39,6 +39,7 @@ WARNING_SUPPRESS = -Wno-parentheses -Wno @@ -39,6 +39,7 @@
DYLIB_KEY = -shared DYLIB_KEY = -shared
EXPORT_KEY = -Wl,--version-script, EXPORT_KEY = -Wl,--version-script,
LIBDL = -ldl LIBDL = -ldl
@ -8,12 +8,12 @@
TBB_NOSTRICT = 1 TBB_NOSTRICT = 1
@@ -51,7 +52,7 @@ C_FLAGS = $(CPLUS_FLAGS) @@ -60,7 +61,7 @@
ITT_NOTIFY = -DDO_ITT_NOTIFY ITT_NOTIFY = -DDO_ITT_NOTIFY
ifeq ($(cfg), release) ifeq ($(cfg), release)
- CPLUS_FLAGS = $(ITT_NOTIFY) -O2 -DUSE_PTHREAD - CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
+ CPLUS_FLAGS = $(ITT_NOTIFY) -O2 $(OPTFLAGS) -DUSE_PTHREAD + CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 $(OPTFLAGS) -DUSE_PTHREAD
endif endif
ifeq ($(cfg), debug) ifeq ($(cfg), debug)
CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD

12
tbb.spec
View File

@ -17,12 +17,12 @@
Name: tbb Name: tbb
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%define sourcedir tbb30_20110704oss %define sourcedir tbb40_20120613oss
Url: http://threadingbuildingblocks.org/ Url: http://threadingbuildingblocks.org/
License: GPL v2 only License: GPL v2 only
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Version: 30_20110704 Version: 40_20120613
Release: 1.45 Release: 1
Summary: Threading Building Blocks (TBB) Summary: Threading Building Blocks (TBB)
Source0: %{sourcedir}_src.tgz Source0: %{sourcedir}_src.tgz
Patch0: optflags.patch Patch0: optflags.patch
@ -104,11 +104,13 @@ gmake OPTFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
%install %install
mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}/machine mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}/machine
mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}/internal
mkdir -p $RPM_BUILD_ROOT/%{_libdir} mkdir -p $RPM_BUILD_ROOT/%{_libdir}
mkdir -p $RPM_BUILD_ROOT/etc/%{name} mkdir -p $RPM_BUILD_ROOT/etc/%{name}
# sic! # sic!
install $RPM_BUILD_DIR/%{sourcedir}/include/tbb/*.h $RPM_BUILD_ROOT/%{_includedir}/%{name} install $RPM_BUILD_DIR/%{sourcedir}/include/tbb/*.h $RPM_BUILD_ROOT/%{_includedir}/%{name}
install $RPM_BUILD_DIR/%{sourcedir}/include/tbb/machine/linux*.h $RPM_BUILD_ROOT/%{_includedir}/%{name}/machine install $RPM_BUILD_DIR/%{sourcedir}/include/tbb/machine/linux*.h $RPM_BUILD_ROOT/%{_includedir}/%{name}/machine
install $RPM_BUILD_DIR/%{sourcedir}/include/tbb/internal/*.h $RPM_BUILD_ROOT/%{_includedir}/%{name}/internal
install $RPM_BUILD_DIR/%{sourcedir}/build/linux*release/*.so.2 $RPM_BUILD_ROOT/%{_libdir} install $RPM_BUILD_DIR/%{sourcedir}/build/linux*release/*.so.2 $RPM_BUILD_ROOT/%{_libdir}
pushd $RPM_BUILD_ROOT/%{_libdir} pushd $RPM_BUILD_ROOT/%{_libdir}
ln -s libtbb.so.2 libtbb.so ln -s libtbb.so.2 libtbb.so
@ -139,9 +141,11 @@ popd
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_includedir}/tbb %dir %{_includedir}/tbb
%attr(755,root,root) %{_includedir}/tbb/machine %attr(755,root,root) %dir %{_includedir}/tbb/machine
%attr(755,root,root) %dir %{_includedir}/tbb/internal
%attr(644,root,root) %{_includedir}/tbb/*.h %attr(644,root,root) %{_includedir}/tbb/*.h
%attr(644,root,root) %{_includedir}/tbb/machine/*.h %attr(644,root,root) %{_includedir}/tbb/machine/*.h
%attr(644,root,root) %{_includedir}/tbb/internal/*.h
%{_libdir}/libtbb.so %{_libdir}/libtbb.so
%{_libdir}/libtbbmalloc.so %{_libdir}/libtbbmalloc.so

3
tbb40_20120613oss_src.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aaa98146049e55f6ac969298340eeb49df61395403fcc1480824a4ecd0d46192
size 2167860