[tbb] 08/64: Imported Debian patch 2.0r020-1
Graham Inggs
ginggs at moszumanska.debian.org
Mon Jul 3 12:27:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
ginggs pushed a commit to branch master
in repository tbb.
commit 22ef5a23e9b5027d191bedb600bf298ac13db8d6
Merge: 7a8a521 da7a2b1
Author: Roberto C. Sanchez <roberto at connexer.com>
Date: Tue Apr 29 15:31:09 2008 -0400
Imported Debian patch 2.0r020-1
build/windows.icl.inc | 5 +-
debian/changelog | 7 +
debian/patches/00list | 1 -
debian/patches/01_add_soname.dpatch | 2 +-
debian/patches/04_g++-4.3.dpatch | 19 --
debian/rules | 2 +-
debian/shlibs.local | 1 -
examples/test_all/fibonacci/Fibonacci.cpp | 11 +-
include/tbb/cache_aligned_allocator.h | 5 +-
include/tbb/machine/linux_common.h | 95 ++++++
include/tbb/machine/linux_em64t.h | 5 +-
include/tbb/machine/linux_ia32.h | 5 +-
include/tbb/machine/linux_itanium.h | 5 +-
include/tbb/pipeline.h | 12 +-
include/tbb/scalable_allocator.h | 2 +-
include/tbb/tbb_machine.h | 15 +
src/tbb/concurrent_queue.cpp | 539 +++++++++++++++++++++++++++++-
src/tbb/concurrent_vector.cpp | 1 +
src/tbb/gate.h | 39 ++-
src/tbb/pipeline.cpp | 84 ++---
src/tbb/queuing_mutex.cpp | 3 -
src/tbb/queuing_rw_mutex.cpp | 3 -
src/tbb/task.cpp | 170 ++++++----
src/tbbmalloc/MemoryAllocator.cpp | 5 +-
src/test/test_allocator.h | 6 +
src/test/test_assembly.cpp | 10 +
src/test/test_malloc_pure_c.c | 11 +-
src/test/test_pipeline.cpp | 27 +-
src/test/test_yield.cpp | 2 +-
29 files changed, 914 insertions(+), 178 deletions(-)
diff --cc debian/changelog
index a120d89,0000000..59143d8
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,0 +1,42 @@@
++tbb (2.0r020-1) unstable; urgency=low
++
++ * New upstream release.
++ * debian/patches/04_g++-4.3.dpatch: Removed, integrated upstream
++
++ -- Roberto C. Sanchez <roberto at connexer.com> Tue, 29 Apr 2008 15:31:09 -0400
++
+tbb (2.0r017-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Sat, 08 Mar 2008 22:15:13 -0500
+
+tbb (2.0r014-4) unstable; urgency=low
+
+ * Make tbb-examples recommend libtbb-dev.
+ * Make libtbb-dev suggest tbb-examples.
+ * Patch to allow building with g++-4.3 (Closes: #462415)
+ * Only conditionally create symlink (Closes: #465617)
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Thu, 14 Feb 2008 18:36:15 -0500
+
+tbb (2.0r014-3) unstable; urgency=low
+
+ * Fix short descriptions of tbb-examples (Closes: #457442)
+ * Fix short descriptions of libtbb2-dbg (Closes: #457443)
+ * Add patch to allow build to succeed on Itanium
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Thu, 3 Jan 2008 15:21:50 -0500
+
+tbb (2.0r014-2) unstable; urgency=low
+
+ * debian/copyright: Fix license statement.
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Wed, 19 Dec 2007 21:17:16 -0500
+
+tbb (2.0r014-1) unstable; urgency=low
+
+ * Initial release (Closes: #434583)
+
+ -- Roberto C. Sanchez <roberto at connexer.com> Fri, 14 Dec 2007 23:10:58 -0500
+
diff --cc debian/patches/00list
index 3e69e8f,0000000..7c53d5a
mode 100644,000000..100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,4 -1,0 +1,3 @@@
+01_add_soname.dpatch
+02_replace_arch_command.dpatch
+03_ias_patch.dpatch
- 04_g++-4.3.dpatch
diff --cc debian/patches/01_add_soname.dpatch
index 6a6b55c,0000000..498032b
mode 100644,000000..100644
--- a/debian/patches/01_add_soname.dpatch
+++ b/debian/patches/01_add_soname.dpatch
@@@ -1,60 -1,0 +1,60 @@@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_add_soname.dpatch by <roberto at connexer.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds a SONAME to the library
+
+ at DPATCH@
+
+diff -ur tbb-2.0r014/build/Makefile.tbb tbb-2.0r014.test/build/Makefile.tbb
+--- tbb-2.0r014/build/Makefile.tbb 2007-09-21 21:16:34.000000000 -0400
++++ tbb-2.0r014.test/build/Makefile.tbb 2007-12-15 17:28:09.000000000 -0500
+@@ -74,9 +74,12 @@
+
+ # Object files that gmake up TBB (TBB_ASM.OBJ is platform-specific)
+ TBB.OBJ = $(TBB_CPLUS.OBJ) $(TBB_ASM.OBJ)
++LIB_LINK_FLAGS += -Wl,-soname=$(TBB.DLL).$(SONAME_SUFFIX)
+
+ $(TBB.DLL): $(TBB.OBJ) $(TBB.DEF) $(TBB.RES) tbbvars
+- $(CPLUS) $(TBB.OBJ) $(TBB.RES) $(LIBS) $(PIC_KEY) $(OUTPUT_KEY)$(TBB.DLL) $(LIB_LINK_FLAGS)
++ $(CPLUS) $(TBB.OBJ) $(TBB.RES) $(LIBS) $(PIC_KEY) $(OUTPUT_KEY)$(TBB.DLL).$(VERSION) $(LIB_LINK_FLAGS)
++ [ -L $(TBB.DLL).$(SONAME_SUFFIX) ] || ln -s $(TBB.DLL).$(VERSION) $(TBB.DLL).$(SONAME_SUFFIX)
++ [ -L $(TBB.DLL) ] || ln -s $(TBB.DLL).$(VERSION) $(TBB.DLL)
+
+
+ #clean:
+diff -ur tbb-2.0r014/build/Makefile.tbbmalloc tbb-2.0r014.test/build/Makefile.tbbmalloc
+--- tbb-2.0r014/build/Makefile.tbbmalloc 2007-09-21 21:16:34.000000000 -0400
++++ tbb-2.0r014.test/build/Makefile.tbbmalloc 2007-12-15 17:28:32.000000000 -0500
+@@ -58,6 +58,7 @@
+ # MALLOC_CPLUS.OBJ is built in two steps due to Intel Compiler Tracker # C69574
+ MALLOC.OBJ := $(MALLOC_CPLUS.OBJ) $(MALLOC_ASM.OBJ) $(MALLOC_CUSTOM.OBJ) MemoryAllocator.$(OBJ)
+ MALLOC_CPLUS.OBJ += MemoryAllocator.$(OBJ)
++LIB_LINK_FLAGS += -Wl,-soname=$(MALLOC.DLL).$(SONAME_SUFFIX)
+
+
+ $(MALLOC_CPLUS.OBJ): %.$(OBJ): %.cpp
+@@ -69,7 +70,9 @@
+
+ $(MALLOC.DLL): TBB.DEF=$(MALLOC.DEF)
+ $(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.DEF) $(TBBMALLOC.RES)
+- $(CPLUS) $(MALLOC.OBJ) $(TBBMALLOC.RES) $(LIBS) $(PIC_KEY) $(OUTPUT_KEY)$(MALLOC.DLL) $(LIB_LINK_FLAGS)
++ $(CPLUS) $(MALLOC.OBJ) $(TBBMALLOC.RES) $(LIBS) $(PIC_KEY) $(OUTPUT_KEY)$(MALLOC.DLL).$(VERSION) $(LIB_LINK_FLAGS)
++ [ -L $(MALLOC.DLL).$(SONAME_SUFFIX) ] || ln -s $(MALLOC.DLL).$(VERSION) $(MALLOC.DLL).$(SONAME_SUFFIX)
++ [ -L $(MALLOC.DLL) ] || ln -s $(MALLOC.DLL).$(VERSION) $(MALLOC.DLL)
+
+ malloc: $(MALLOC.DLL)
+
+diff -ur tbb-2.0r014/build/common.inc tbb-2.0r014.test/build/common.inc
+--- tbb-2.0r014/build/common.inc 2007-09-21 21:16:34.000000000 -0400
++++ tbb-2.0r014.test/build/common.inc 2007-12-15 16:43:10.000000000 -0500
+@@ -24,6 +24,9 @@
+ # invalidate any other reasons why the executable file might be covered by
+ # the GNU General Public License.
+
- +VERSION=2.0.017
+++VERSION=2.0.020
++SONAME_SUFFIX=2
++
+ ifndef tbb_os
+ ifeq ($(OS), Windows_NT)
+ export tbb_os=windows
diff --cc debian/rules
index 439a3eb,0000000..e61b2e6
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,98 -1,0 +1,98 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+# shared library versions, option 1
+version=2.0.014
+major=2
+
+configure: configure-stamp
+configure-stamp: patch
+ dh_testdir
+ # Add here commands to configure the package.
+ touch configure-stamp
+
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE) tbb_release tbbmalloc_release
+ touch $@
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ -$(MAKE) clean
+ dh_clean
+
+patch: patch-stamp
+patch-stamp:
+ dpatch apply-all
+
+unpatch:
+ dpatch deapply-all
+ rm -rf patch-stamp debian/patched
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir -i
+ dh_testroot -i
+ dh_installchangelogs -i
+ dh_installdocs -i -Xrelease -Xdebug
+ dh_installexamples -i
+ dh_install -i --sourcedir=$(CURDIR)
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir -s
+ dh_testroot -s
+ dh_installchangelogs -s
+ dh_installdocs -s -Xrelease -Xdebug
+ dh_installexamples -s
+ dh_install --sourcedir=$(CURDIR)
+ dh_link -s
+ dh_strip -s --dbg-package=libtbb2-dbg
+ dh_compress -s
+ dh_fixperms -s
- dh_makeshlibs -s
++ dh_makeshlibs -s -V 'libtbb2 (>= 2.0r020)'
+ dh_installdeb -s
+ dh_shlibdeps -s
+ dh_gencontrol -s
+ dh_md5sums -s
+ dh_builddeb -s
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tbb.git
More information about the debian-science-commits
mailing list