diff --git a/optflags.patch b/optflags.patch index f81d614..57cdd30 100644 --- a/optflags.patch +++ b/optflags.patch @@ -1,19 +1,19 @@ ---- build/linux.gcc.inc +--- build/linux.gcc.inc.orig +++ build/linux.gcc.inc -@@ -37,6 +37,7 @@ - RML_WARNING_SUPPRESS = -Wno-non-virtual-dtor +@@ -39,6 +39,7 @@ WARNING_SUPPRESS = -Wno-parentheses -Wno DYLIB_KEY = -shared + EXPORT_KEY = -Wl,--version-script, LIBDL = -ldl +OPTFLAGS = -O2 TBB_NOSTRICT = 1 -@@ -47,7 +48,7 @@ - C_FLAGS = $(CPLUS_FLAGS) +@@ -51,7 +52,7 @@ C_FLAGS = $(CPLUS_FLAGS) + ITT_NOTIFY = -DDO_ITT_NOTIFY ifeq ($(cfg), release) -- CPLUS_FLAGS = -DDO_ITT_NOTIFY -O2 -DUSE_PTHREAD -+ CPLUS_FLAGS = -DDO_ITT_NOTIFY $(OPTFLAGS) -DUSE_PTHREAD +- CPLUS_FLAGS = $(ITT_NOTIFY) -O2 -DUSE_PTHREAD ++ CPLUS_FLAGS = $(ITT_NOTIFY) -O2 $(OPTFLAGS) -DUSE_PTHREAD endif ifeq ($(cfg), debug) - CPLUS_FLAGS = -DTBB_USE_DEBUG -DDO_ITT_NOTIFY -g -O0 -DUSE_PTHREAD + CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD diff --git a/tbb.changes b/tbb.changes index 2693c02..cdffecd 100644 --- a/tbb.changes +++ b/tbb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Aug 14 23:35:15 UTC 2011 - crrodriguez@opensuse.org + +- Update to version tbb30_20110704 + ------------------------------------------------------------------- Wed Sep 16 11:09:37 CEST 2009 - meissner@suse.de diff --git a/tbb.spec b/tbb.spec index 4fbb4e0..b718890 100644 --- a/tbb.spec +++ b/tbb.spec @@ -20,12 +20,12 @@ Name: tbb BuildRequires: gcc-c++ -%define sourcedir tbb22_20090809oss +%define sourcedir tbb30_20110704oss Url: http://threadingbuildingblocks.org/ License: GPL v2 only Group: Development/Libraries/C and C++ AutoReqProv: on -Version: 22_20090809 +Version: 30_20110704 Release: 1.45 Summary: Threading Building Blocks (TBB) Source0: %{sourcedir}_src.tgz @@ -49,7 +49,7 @@ mechanism for performance and scalability. License: GPL v2 only Group: Development/Libraries/C and C++ Summary: Threading Building Blocks (TBB) -Provides: %{name} < %{version} +Provides: %{name} = %{version} Obsoletes: %{name} < %{version} %description -n libtbb2 @@ -67,7 +67,7 @@ mechanism for performance and scalability. License: GPL v2 only Group: Development/Libraries/C and C++ Summary: Threading Building Blocks (TBB) -Provides: %{name} < %{version} +Provides: %{name} = %{version} Obsoletes: %{name} < %{version} %description -n libtbbmalloc2 @@ -87,7 +87,7 @@ Group: Development/Libraries/C and C++ Summary: Threading Building Blocks (TBB) Requires: /bin/sh, /bin/csh Requires: c++_compiler -Requires: libtbb2, libtbbmalloc2 +Requires: libtbb2 = %{version} libtbbmalloc2 = %{version} %description devel Intel® Threading Building Blocks (TBB) offers a rich and complete diff --git a/tbb22_20090809oss_src.tgz b/tbb22_20090809oss_src.tgz deleted file mode 100644 index e4a59d5..0000000 --- a/tbb22_20090809oss_src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56dcd2b2c191dc61094110d2ae95d377c8b8b08fea3055f217da4af7a1e0074a -size 1496087 diff --git a/tbb30_20110704oss_src.tgz b/tbb30_20110704oss_src.tgz new file mode 100644 index 0000000..276d45e --- /dev/null +++ b/tbb30_20110704oss_src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93c6f9c76c8740a79499ccc91db6b39885187b5fa7d447c95df37f3ae72295af +size 1856934