[tbb] 06/64: Imported Debian patch 2.0r017-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 7a8a5214a15df914022f3aa4322088aa4bc4b08e
Merge: c96d05f 458e328
Author: Roberto C. Sanchez <roberto at connexer.com>
Date: Sat Mar 8 22:15:13 2008 -0500
Imported Debian patch 2.0r017-1
Makefile | 2 +-
build/FreeBSD.gcc.inc | 2 +-
build/FreeBSD.inc | 2 +-
build/Makefile.tbb | 2 +-
build/Makefile.tbbmalloc | 2 +-
build/Makefile.test | 2 +-
build/SunOS.gcc.inc | 2 +-
build/SunOS.inc | 2 +-
build/common.inc | 2 +-
build/common_rules.inc | 2 +-
build/detect.js | 2 +-
build/generate_tbbvars.bat | 2 +-
build/generate_tbbvars.sh | 2 +-
build/index.html | 2 +-
build/linux.gcc.inc | 2 +-
build/linux.icc.inc | 2 +-
build/linux.inc | 2 +-
build/macos.gcc.inc | 2 +-
build/macos.icc.inc | 2 +-
build/macos.inc | 2 +-
build/version_info_linux.sh | 2 +-
build/version_info_macos.sh | 2 +-
build/version_info_windows.js | 2 +-
build/windows.cl.inc | 2 +-
build/windows.icl.inc | 2 +-
build/windows.inc | 2 +-
debian/changelog | 6 +
debian/patches/01_add_soname.dpatch | 2 +-
examples/GettingStarted/index.html | 2 +-
examples/GettingStarted/sub_string_finder/Makefile | 2 +-
.../sub_string_finder/Makefile.windows | 2 +-
.../GettingStarted/sub_string_finder/index.html | 4 +-
.../sub_string_finder/sub_string_finder.cpp | 2 +-
.../sub_string_finder_extended.cpp | 2 +-
.../sub_string_finder/sub_string_finder_pretty.cpp | 2 +-
.../sub_string_finder/vc9/sub_string_finder.sln | 50 +
.../sub_string_finder/vc9/sub_string_finder.suo | Bin 0 -> 16384 bytes
.../sub_string_finder/vc9/sub_string_finder.vcproj | 345 +++++++
.../vc9/sub_string_finder_extended.vcproj | 345 +++++++
.../vc9/sub_string_finder_pretty.vcproj | 345 +++++++
examples/Makefile | 2 +-
examples/common/gui/Makefile.win | 2 +-
examples/common/gui/convideo.cpp | 2 +-
examples/common/gui/ddvideo.cpp | 2 +-
examples/common/gui/dxcheck.bat | 2 +-
examples/common/gui/gdivideo.cpp | 2 +-
examples/common/gui/macvideo.cpp | 2 +-
examples/common/gui/video.h | 2 +-
examples/common/gui/winvideo.h | 2 +-
examples/common/gui/xvideo.cpp | 2 +-
examples/common/index.html | 2 +-
.../concurrent_hash_map/count_strings/Makefile | 2 +-
.../count_strings/Makefile.windows | 2 +-
.../count_strings/count_strings.cpp | 2 +-
.../concurrent_hash_map/count_strings/index.html | 4 +-
.../count_strings/vc9/count_strings.sln | 25 +
.../count_strings/vc9/count_strings.suo | Bin 0 -> 11776 bytes
.../count_strings/vc9/count_strings.vcproj | 343 +++++++
examples/concurrent_hash_map/index.html | 2 +-
examples/index.html | 2 +-
examples/parallel_for/index.html | 2 +-
examples/parallel_for/seismic/Makefile | 2 +-
examples/parallel_for/seismic/Makefile.windows | 9 +-
.../parallel_for/seismic/SeismicSimulation.cpp | 2 +-
examples/parallel_for/seismic/index.html | 4 +-
.../parallel_for/seismic/vc9/SeismicSimulation.ico | Bin 0 -> 23558 bytes
.../parallel_for/seismic/vc9/SeismicSimulation.rc | 145 +++
.../parallel_for/seismic/vc9/SeismicSimulation.sln | 37 +
.../parallel_for/seismic/vc9/SeismicSimulation.suo | Bin 0 -> 9728 bytes
.../seismic/vc9/SeismicSimulation.vcproj | 805 +++++++++++++++
examples/parallel_for/seismic/vc9/resource.h | 32 +
examples/parallel_for/seismic/vc9/small.ico | Bin 0 -> 23558 bytes
.../seismic/xcode/English.lproj/InfoPlist.strings | 2 +-
examples/parallel_for/tacheon/Makefile | 2 +-
examples/parallel_for/tacheon/Makefile.windows | 9 +-
examples/parallel_for/tacheon/index.html | 4 +-
examples/parallel_for/tacheon/src/api.cpp | 4 +-
examples/parallel_for/tacheon/src/api.h | 4 +-
examples/parallel_for/tacheon/src/apigeom.cpp | 4 +-
examples/parallel_for/tacheon/src/apitrigeom.cpp | 4 +-
examples/parallel_for/tacheon/src/apitrigeom.h | 2 +-
examples/parallel_for/tacheon/src/bndbox.cpp | 4 +-
examples/parallel_for/tacheon/src/bndbox.h | 4 +-
examples/parallel_for/tacheon/src/box.cpp | 4 +-
examples/parallel_for/tacheon/src/box.h | 4 +-
examples/parallel_for/tacheon/src/camera.cpp | 4 +-
examples/parallel_for/tacheon/src/camera.h | 4 +-
examples/parallel_for/tacheon/src/coordsys.cpp | 4 +-
examples/parallel_for/tacheon/src/coordsys.h | 4 +-
examples/parallel_for/tacheon/src/cylinder.cpp | 4 +-
examples/parallel_for/tacheon/src/cylinder.h | 4 +-
examples/parallel_for/tacheon/src/extvol.cpp | 4 +-
examples/parallel_for/tacheon/src/extvol.h | 4 +-
examples/parallel_for/tacheon/src/getargs.cpp | 2 +-
examples/parallel_for/tacheon/src/getargs.h | 2 +-
examples/parallel_for/tacheon/src/global.cpp | 4 +-
examples/parallel_for/tacheon/src/global.h | 4 +-
examples/parallel_for/tacheon/src/grid.cpp | 4 +-
examples/parallel_for/tacheon/src/grid.h | 4 +-
examples/parallel_for/tacheon/src/imageio.cpp | 4 +-
examples/parallel_for/tacheon/src/imageio.h | 4 +-
examples/parallel_for/tacheon/src/imap.cpp | 4 +-
examples/parallel_for/tacheon/src/imap.h | 4 +-
examples/parallel_for/tacheon/src/intersect.cpp | 4 +-
examples/parallel_for/tacheon/src/intersect.h | 4 +-
examples/parallel_for/tacheon/src/jpeg.cpp | 4 +-
examples/parallel_for/tacheon/src/jpeg.h | 4 +-
examples/parallel_for/tacheon/src/light.cpp | 4 +-
examples/parallel_for/tacheon/src/light.h | 4 +-
examples/parallel_for/tacheon/src/machine.h | 4 +-
examples/parallel_for/tacheon/src/macros.h | 4 +-
examples/parallel_for/tacheon/src/objbound.cpp | 4 +-
examples/parallel_for/tacheon/src/objbound.h | 4 +-
examples/parallel_for/tacheon/src/parse.cpp | 4 +-
examples/parallel_for/tacheon/src/parse.h | 4 +-
examples/parallel_for/tacheon/src/plane.cpp | 4 +-
examples/parallel_for/tacheon/src/plane.h | 4 +-
examples/parallel_for/tacheon/src/ppm.cpp | 4 +-
examples/parallel_for/tacheon/src/ppm.h | 4 +-
examples/parallel_for/tacheon/src/pthread.cpp | 2 +-
examples/parallel_for/tacheon/src/pthread.h | 2 +-
examples/parallel_for/tacheon/src/quadric.cpp | 4 +-
examples/parallel_for/tacheon/src/quadric.h | 4 +-
examples/parallel_for/tacheon/src/render.cpp | 4 +-
examples/parallel_for/tacheon/src/render.h | 4 +-
examples/parallel_for/tacheon/src/ring.cpp | 4 +-
examples/parallel_for/tacheon/src/ring.h | 4 +-
examples/parallel_for/tacheon/src/shade.cpp | 4 +-
examples/parallel_for/tacheon/src/shade.h | 4 +-
examples/parallel_for/tacheon/src/sphere.cpp | 4 +-
examples/parallel_for/tacheon/src/sphere.h | 4 +-
examples/parallel_for/tacheon/src/texture.cpp | 4 +-
examples/parallel_for/tacheon/src/texture.h | 4 +-
examples/parallel_for/tacheon/src/tgafile.cpp | 4 +-
examples/parallel_for/tacheon/src/tgafile.h | 4 +-
examples/parallel_for/tacheon/src/trace.h | 4 +-
examples/parallel_for/tacheon/src/trace.serial.cpp | 2 +-
examples/parallel_for/tacheon/src/trace.tbb.cpp | 2 +-
examples/parallel_for/tacheon/src/trace.tbb1d.cpp | 2 +-
examples/parallel_for/tacheon/src/trace_rest.cpp | 4 +-
examples/parallel_for/tacheon/src/triangle.cpp | 4 +-
examples/parallel_for/tacheon/src/triangle.h | 4 +-
examples/parallel_for/tacheon/src/types.h | 4 +-
examples/parallel_for/tacheon/src/ui.cpp | 4 +-
examples/parallel_for/tacheon/src/ui.h | 4 +-
examples/parallel_for/tacheon/src/util.cpp | 4 +-
examples/parallel_for/tacheon/src/util.h | 4 +-
examples/parallel_for/tacheon/src/vector.cpp | 4 +-
examples/parallel_for/tacheon/src/vector.h | 4 +-
examples/parallel_for/tacheon/src/video.cpp | 4 +-
examples/parallel_for/tacheon/src/video.h | 2 +-
examples/parallel_for/tacheon/src/vol.cpp | 4 +-
examples/parallel_for/tacheon/src/vol.h | 4 +-
.../parallel_for/tacheon/vc9/tacheon.serial.vcproj | 683 +++++++++++++
examples/parallel_for/tacheon/vc9/tacheon.sln | 92 ++
examples/parallel_for/tacheon/vc9/tacheon.suo | Bin 0 -> 18432 bytes
.../parallel_for/tacheon/vc9/tacheon.tbb.vcproj | 719 ++++++++++++++
.../parallel_for/tacheon/vc9/tacheon.tbb1d.vcproj | 719 ++++++++++++++
.../tacheon/vc9/tacheon.threads.vcproj | 687 +++++++++++++
examples/parallel_for/tacheon/vc9/tacheon.vcproj | 1039 ++++++++++++++++++++
.../tacheon/xcode/English.lproj/InfoPlist.strings | 2 +-
examples/parallel_reduce/convex_hull/Makefile | 2 +-
.../parallel_reduce/convex_hull/Makefile.windows | 2 +-
examples/parallel_reduce/convex_hull/convex_hull.h | 2 +-
.../convex_hull/convex_hull_bench.cpp | 4 +-
.../convex_hull/convex_hull_sample.cpp | 4 +-
examples/parallel_reduce/convex_hull/index.html | 4 +-
.../convex_hull/vc9/convex_hull.sln | 35 +
.../convex_hull/vc9/convex_hull.suo | Bin 0 -> 9728 bytes
.../convex_hull/vc9/convex_hull_benchmark.vcproj | 355 +++++++
.../convex_hull/vc9/convex_hull_sample.vcproj | 357 +++++++
examples/parallel_reduce/index.html | 2 +-
examples/parallel_reduce/primes/Makefile | 2 +-
examples/parallel_reduce/primes/Makefile.windows | 2 +-
examples/parallel_reduce/primes/index.html | 4 +-
examples/parallel_reduce/primes/primes.cpp | 2 +-
examples/parallel_reduce/primes/vc9/primes.sln | 25 +
examples/parallel_reduce/primes/vc9/primes.suo | Bin 0 -> 8192 bytes
examples/parallel_reduce/primes/vc9/primes.vcproj | 349 +++++++
examples/parallel_while/index.html | 2 +-
.../parallel_while/parallel_preorder/Graph.cpp | 2 +-
examples/parallel_while/parallel_preorder/Graph.h | 2 +-
examples/parallel_while/parallel_preorder/Makefile | 2 +-
.../parallel_preorder/Makefile.windows | 2 +-
examples/parallel_while/parallel_preorder/Matrix.h | 2 +-
.../parallel_while/parallel_preorder/index.html | 4 +-
.../parallel_preorder/parallel_preorder.cpp | 2 +-
.../parallel_preorder/vc9/parallel_preorder.sln | 25 +
.../parallel_preorder/vc9/parallel_preorder.suo | Bin 0 -> 8704 bytes
.../parallel_preorder/vc9/parallel_preorder.vcproj | 367 +++++++
examples/pipeline/index.html | 2 +-
examples/pipeline/text_filter/Makefile | 2 +-
examples/pipeline/text_filter/Makefile.windows | 2 +-
examples/pipeline/text_filter/index.html | 4 +-
examples/pipeline/text_filter/text_filter.cpp | 2 +-
examples/pipeline/text_filter/vc9/text_filter.sln | 25 +
examples/pipeline/text_filter/vc9/text_filter.suo | Bin 0 -> 8192 bytes
.../pipeline/text_filter/vc9/text_filter.vcproj | 361 +++++++
examples/task/index.html | 2 +-
examples/task/tree_sum/Makefile | 2 +-
examples/task/tree_sum/Makefile.windows | 2 +-
.../task/tree_sum/OptimizedParallelSumTree.cpp | 2 +-
examples/task/tree_sum/SerialSumTree.cpp | 2 +-
examples/task/tree_sum/SimpleParallelSumTree.cpp | 2 +-
examples/task/tree_sum/common.h | 2 +-
examples/task/tree_sum/index.html | 4 +-
examples/task/tree_sum/main.cpp | 2 +-
examples/task/tree_sum/vc9/tree_sum.sln | 25 +
examples/task/tree_sum/vc9/tree_sum.suo | Bin 0 -> 9216 bytes
examples/task/tree_sum/vc9/tree_sum.vcproj | 365 +++++++
examples/test_all/fibonacci/Fibonacci.cpp | 2 +-
examples/test_all/fibonacci/Makefile | 2 +-
examples/test_all/fibonacci/Makefile.windows | 2 +-
examples/test_all/fibonacci/index.html | 4 +-
examples/test_all/fibonacci/vc9/fibonacci.sln | 25 +
examples/test_all/fibonacci/vc9/fibonacci.suo | Bin 0 -> 9216 bytes
examples/test_all/fibonacci/vc9/fibonacci.vcproj | 349 +++++++
examples/test_all/index.html | 2 +-
include/index.html | 2 +-
include/tbb/_tbb_windef.h | 2 +-
include/tbb/aligned_space.h | 2 +-
include/tbb/atomic.h | 2 +-
include/tbb/blocked_range.h | 2 +-
include/tbb/blocked_range2d.h | 2 +-
include/tbb/blocked_range3d.h | 2 +-
include/tbb/cache_aligned_allocator.h | 2 +-
include/tbb/concurrent_hash_map.h | 8 +-
include/tbb/concurrent_queue.h | 6 +-
include/tbb/concurrent_vector.h | 2 +-
include/tbb/machine/linux_em64t.h | 2 +-
include/tbb/machine/linux_ia32.h | 2 +-
include/tbb/machine/linux_itanium.h | 2 +-
include/tbb/machine/mac_ppc.h | 2 +-
include/tbb/machine/windows_em64t.h | 7 +-
include/tbb/machine/windows_ia32.h | 7 +-
include/tbb/machine/windows_ia32_inline.h | 7 +-
include/tbb/mutex.h | 2 +-
include/tbb/parallel_for.h | 2 +-
include/tbb/parallel_reduce.h | 2 +-
include/tbb/parallel_scan.h | 2 +-
include/tbb/parallel_sort.h | 2 +-
include/tbb/parallel_while.h | 2 +-
include/tbb/partitioner.h | 2 +-
include/tbb/pipeline.h | 2 +-
include/tbb/queuing_mutex.h | 2 +-
include/tbb/queuing_rw_mutex.h | 2 +-
include/tbb/scalable_allocator.h | 4 +-
include/tbb/spin_mutex.h | 2 +-
include/tbb/spin_rw_mutex.h | 2 +-
include/tbb/task.h | 2 +-
include/tbb/task_scheduler_init.h | 2 +-
include/tbb/tbb_machine.h | 2 +-
include/tbb/tbb_stddef.h | 2 +-
include/tbb/tick_count.h | 2 +-
index.html | 2 +-
src/index.html | 2 +-
src/tbb/Makefile | 2 +-
src/tbb/cache_aligned_allocator.cpp | 2 +-
src/tbb/concurrent_hash_map.cpp | 2 +-
src/tbb/concurrent_queue.cpp | 11 +-
src/tbb/concurrent_vector.cpp | 2 +-
src/tbb/em64t-masm/atomic_support.asm | 2 +-
src/tbb/em64t-tbb-mac-export.txt | 2 +-
src/tbb/em64t-tbb.def | 2 +-
src/tbb/gate.h | 2 +-
src/tbb/ia32-masm/atomic_support.asm | 2 +-
src/tbb/ia32-masm/lock_byte.asm | 2 +-
src/tbb/ia32-tbb-mac-export.txt | 2 +-
src/tbb/ia32-tbb.def | 2 +-
src/tbb/itanium-gas/atomic_support.s | 2 +-
src/tbb/itanium-gas/lock_byte.s | 2 +-
src/tbb/itanium-gas/log2.s | 2 +-
src/tbb/itanium-gas/pause.s | 2 +-
src/tbb/itanium-tbb.def | 2 +-
src/tbb/itt_notify.cpp | 2 +-
src/tbb/itt_notify.h | 2 +-
src/tbb/mutex.cpp | 2 +-
src/tbb/pipeline.cpp | 2 +-
src/tbb/queuing_mutex.cpp | 2 +-
src/tbb/queuing_rw_mutex.cpp | 2 +-
src/tbb/spin_mutex.cpp | 2 +-
src/tbb/spin_rw_mutex.cpp | 2 +-
src/tbb/task.cpp | 24 +-
src/tbb/tbb_misc.cpp | 2 +-
src/tbb/tbb_misc.h | 2 +-
src/tbb/tbb_resource.rc | 2 +-
src/tbb/tbb_version.h | 2 +-
src/tbbmalloc/Customize.h | 2 +-
src/tbbmalloc/LifoQueue.h | 2 +-
src/tbbmalloc/MapMemory.h | 2 +-
src/tbbmalloc/MemoryAllocator.cpp | 7 +-
src/tbbmalloc/Statistics.h | 2 +-
src/tbbmalloc/TypeDefinitions.h | 2 +-
src/tbbmalloc/em64t-malloc-mac-export.txt | 2 +-
src/tbbmalloc/em64t-malloc.def | 2 +-
src/tbbmalloc/ia32-malloc-mac-export.txt | 2 +-
src/tbbmalloc/ia32-malloc.def | 2 +-
src/tbbmalloc/tbbmalloc.cpp | 2 +-
src/tbbmalloc/tbbmalloc.rc | 2 +-
src/test/Makefile | 2 +-
src/test/harness.h | 2 +-
src/test/harness_allocator.h | 2 +-
src/test/harness_assert.h | 2 +-
src/test/harness_bad_expr.h | 2 +-
src/test/harness_cpu.h | 2 +-
src/test/harness_memory.h | 15 +-
src/test/test_ScalableAllocator.cpp | 2 +-
src/test/test_ScalableAllocator_STL.cpp | 2 +-
src/test/test_aligned_space.cpp | 2 +-
src/test/test_allocator.h | 2 +-
src/test/test_assembly.cpp | 2 +-
src/test/test_atomic.cpp | 2 +-
src/test/test_blocked_range.cpp | 2 +-
src/test/test_blocked_range2d.cpp | 2 +-
src/test/test_blocked_range3d.cpp | 2 +-
src/test/test_cache_aligned_allocator.cpp | 2 +-
src/test/test_cache_aligned_allocator_STL.cpp | 2 +-
src/test/test_concurrent_hash_map.cpp | 8 +-
src/test/test_concurrent_hash_map_string.cpp | 2 +-
src/test/test_concurrent_queue.cpp | 37 +-
src/test/test_concurrent_vector.cpp | 2 +-
src/test/test_halt.cpp | 2 +-
src/test/test_handle_perror.cpp | 2 +-
src/test/test_inits_loop.cpp | 2 +-
src/test/test_malloc_compliance.cpp | 2 +-
src/test/test_malloc_pure_c.c | 2 +-
src/test/test_model_plugin.cpp | 2 +-
src/test/test_mutex.cpp | 2 +-
src/test/test_mutex_native_threads.cpp | 2 +-
src/test/test_openmp.cpp | 2 +-
src/test/test_parallel_for.cpp | 2 +-
src/test/test_parallel_reduce.cpp | 2 +-
src/test/test_parallel_scan.cpp | 2 +-
src/test/test_parallel_sort.cpp | 2 +-
src/test/test_parallel_while.cpp | 2 +-
src/test/test_pipeline.cpp | 2 +-
src/test/test_rwm_upgrade_downgrade.cpp | 2 +-
src/test/test_task.cpp | 8 +-
src/test/test_task_leaks.cpp | 2 +-
src/test/test_task_scheduler_init.cpp | 2 +-
src/test/test_tick_count.cpp | 2 +-
src/test/test_yield.cpp | 2 +-
342 files changed, 9563 insertions(+), 414 deletions(-)
diff --cc debian/changelog
index c857086,0000000..a120d89
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,0 +1,35 @@@
++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/01_add_soname.dpatch
index 26fc95d,0000000..6a6b55c
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.014
+++VERSION=2.0.017
++SONAME_SUFFIX=2
++
+ ifndef tbb_os
+ ifeq ($(OS), Windows_NT)
+ export tbb_os=windows
--
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