From 29a05f65c9f530962eb101297ed7c49b5ead5ad6 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 6 May 2016 09:01:55 -0600 Subject: [PATCH] Rebase to 4.4u4. --- sources | 2 +- tbb-4.4-cxxflags.patch | 18 +++++++++--------- tbb.spec | 9 ++++++--- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/sources b/sources index b9fedcd..b4bc3c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1908b8901730fa1049f0c45d8d0e6d7d tbb44_20160316oss_src.tgz +95999ccff3470f6565c516e67fb37019 tbb44_20160413oss_src.tgz diff --git a/tbb-4.4-cxxflags.patch b/tbb-4.4-cxxflags.patch index 94f0ecb..2631480 100644 --- a/tbb-4.4-cxxflags.patch +++ b/tbb-4.4-cxxflags.patch @@ -1,7 +1,7 @@ -diff -up tbb44_20151115oss/build/linux.gcc.inc\~ tbb44_20151115oss/build/linux.gcc.inc ---- tbb44_20151115oss/build/linux.gcc.inc~ 2015-11-25 03:48:43.000000000 -0700 -+++ tbb44_20151115oss/build/linux.gcc.inc 2016-01-14 20:02:13.829449849 -0700 -@@ -54,10 +54,10 @@ ifneq (,$(shell gcc -dumpversion | egrep +diff -up tbb44_20160413oss/build/linux.gcc.inc~ tbb44_20160413oss/build/linux.gcc.inc +--- tbb44_20160413oss/build/linux.gcc.inc~ 2016-04-14 08:47:01.000000000 -0600 ++++ tbb44_20160413oss/build/linux.gcc.inc 2016-05-06 08:25:44.477787435 -0600 +@@ -50,10 +50,10 @@ ifneq (,$(shell gcc -dumpversion | egrep endif ifeq ($(cfg), release) @@ -13,10 +13,10 @@ diff -up tbb44_20151115oss/build/linux.gcc.inc\~ tbb44_20151115oss/build/linux.g + CPLUS_FLAGS = $(CXXFLAGS) -DTBB_USE_DEBUG $(ITT_NOTIFY) -g -O0 -DUSE_PTHREAD endif - ifneq (00,$(lambdas)$(cpp0x)) -diff -up tbb44_20151115oss/build/Makefile.tbbmalloc\~ tbb44_20151115oss/build/Makefile.tbbmalloc ---- tbb44_20151115oss/build/Makefile.tbbmalloc~ 2015-11-25 03:48:44.000000000 -0700 -+++ tbb44_20151115oss/build/Makefile.tbbmalloc 2016-01-14 20:20:49.514774850 -0700 + TBB_ASM.OBJ= +diff -up tbb44_20160413oss/build/Makefile.tbbmalloc~ tbb44_20160413oss/build/Makefile.tbbmalloc +--- tbb44_20160413oss/build/Makefile.tbbmalloc~ 2016-04-14 08:47:01.000000000 -0600 ++++ tbb44_20160413oss/build/Makefile.tbbmalloc 2016-05-06 08:25:44.504785259 -0600 @@ -51,7 +51,7 @@ ORIG_LINK_MALLOC.LIB:=$(LINK_MALLOC.LIB) MALLOC_CPLUS.OBJ = backend.$(OBJ) large_objects.$(OBJ) backref.$(OBJ) tbbmalloc.$(OBJ) MALLOC.OBJ := $(MALLOC_CPLUS.OBJ) $(MALLOC_ASM.OBJ) itt_notify_malloc.$(OBJ) frontend.$(OBJ) @@ -27,4 +27,4 @@ diff -up tbb44_20151115oss/build/Makefile.tbbmalloc\~ tbb44_20151115oss/build/Ma # Suppress superfluous warnings for TBBMalloc compilation -Diff finished. Thu Jan 14 20:22:27 2016 +Diff finished. Fri May 6 08:25:55 2016 diff --git a/tbb.spec b/tbb.spec index c2328d9..5098861 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,7 +1,7 @@ -%global releasedate 20160316 +%global releasedate 20160413 %global major 4 %global minor 4 -%global update 3 +%global update 4 %global dotver %{major}.%{minor} %global sourcebasename tbb%{major}%{minor}_%{releasedate}oss @@ -10,7 +10,7 @@ Name: tbb Summary: The Threading Building Blocks library abstracts low-level threading details Version: %{dotver} -Release: 5.%{releasedate}%{?dist} +Release: 6.%{releasedate}%{?dist} License: GPLv2 with exceptions Group: Development/Tools URL: http://threadingbuildingblocks.org/ @@ -159,6 +159,9 @@ done %doc doc/html %changelog +* Fri May 6 2016 Jerry James - 4.4-6.20160413 +- Rebase to 4.4u4 + * Mon Apr 4 2016 Jerry James - 4.4-5.20160316 - Add -fno-delete-null-pointer-checks to fix optimized code