Package: libtbb-dev Version: 4.2~20140122-1.1 Severity: wishlist Tags: patch
Dear Maintainer, it would be nice if libtbb-dev could be co-installed for amd64 and i386. Here is a patch that seems to work for me, though you may want to adapt it a bit and test it more. I used git for the diff to try and make it more visible: the files where I added dh-exec need "chmod +x", and I removed the .dirs files which seem unnecessary. -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (500, 'testing'), (500, 'stable'), (50, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 armhf powerpc Kernel: Linux 3.14-1-amd64 (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages libtbb-dev depends on: ii libtbb2 4.2~20140122-1.1 libtbb-dev recommends no packages. Versions of packages libtbb-dev suggests: pn libtbb-doc <none> pn tbb-examples <none> -- no debconf information
diff --git a/tbb-4.2~20140122/debian/control b/marc/debian/control index 9dc785f..f9f3b72 100644 --- a/tbb-4.2~20140122/debian/control +++ b/marc/debian/control @@ -1,7 +1,7 @@ Source: tbb Priority: extra Maintainer: Steve Capper <[email protected]> -Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), libjs-jquery +Build-Depends: debhelper (>= 9), dh-exec (>=0.3), dpkg-dev (>= 1.16.1~), libjs-jquery Standards-Version: 3.9.4 Section: libs Homepage: http://threadingbuildingblocks.org/ @@ -9,6 +9,7 @@ Homepage: http://threadingbuildingblocks.org/ Package: libtbb-dev Section: libdevel Architecture: any +Multi-arch: same Depends: libtbb2 (= ${binary:Version}), ${misc:Depends} Suggests: tbb-examples, libtbb-doc Description: parallelism library for C++ - development files @@ -25,7 +26,9 @@ Description: parallelism library for C++ - development files Package: libtbb2 Architecture: any +Multi-arch: same Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: parallelism library for C++ - runtime files TBB is a library that helps you leverage multi-core processor performance without having to be a threading expert. It represents a @@ -41,6 +44,7 @@ Description: parallelism library for C++ - runtime files Package: libtbb2-dbg Section: debug Architecture: any +Multi-arch: same Depends: libtbb2 (= ${binary:Version}), ${misc:Depends} Description: parallelism library for C++ - debugging symbols TBB is a library that helps you leverage multi-core processor diff --git a/tbb-4.2~20140122/debian/libtbb-dev.dirs b/tbb-4.2~20140122/debian/libtbb-dev.dirs deleted file mode 100644 index 13cdd2e..0000000 --- a/tbb-4.2~20140122/debian/libtbb-dev.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/include -usr/lib -usr/lib/pkgconfig diff --git a/tbb-4.2~20140122/debian/libtbb-dev.install b/marc/debian/libtbb-dev.install old mode 100644 new mode 100755 index d1207d3..80f6d75 --- a/tbb-4.2~20140122/debian/libtbb-dev.install +++ b/marc/debian/libtbb-dev.install @@ -1,3 +1,4 @@ +#! /usr/bin/dh-exec include/tbb usr/include -build/linux_*_release/lib*.so usr/lib -debian/tbb.pc usr/lib/pkgconfig +build/linux_*_release/lib*.so usr/lib/${DEB_HOST_MULTIARCH} +debian/tbb.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig diff --git a/tbb-4.2~20140122/debian/libtbb-dev.links b/marc/debian/libtbb-dev.links old mode 100644 new mode 100755 index 670c903..6ec86aa --- a/tbb-4.2~20140122/debian/libtbb-dev.links +++ b/marc/debian/libtbb-dev.links @@ -1,3 +1,4 @@ -usr/lib/libtbb.so.2 usr/lib/libtbb.so -usr/lib/libtbbmalloc.so.2 usr/lib/libtbbmalloc.so -usr/lib/libtbbmalloc_proxy.so.2 usr/lib/libtbbmalloc_proxy.so +#! /usr/bin/dh-exec +usr/lib/${DEB_HOST_MULTIARCH}/libtbb.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libtbb.so +usr/lib/${DEB_HOST_MULTIARCH}/libtbbmalloc.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libtbbmalloc.so +usr/lib/${DEB_HOST_MULTIARCH}/libtbbmalloc_proxy.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libtbbmalloc_proxy.so diff --git a/tbb-4.2~20140122/debian/libtbb2.dirs b/tbb-4.2~20140122/debian/libtbb2.dirs deleted file mode 100644 index 6845771..0000000 --- a/tbb-4.2~20140122/debian/libtbb2.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/tbb-4.2~20140122/debian/libtbb2.install b/marc/debian/libtbb2.install old mode 100644 new mode 100755 index a94ab11..c61a3cd --- a/tbb-4.2~20140122/debian/libtbb2.install +++ b/marc/debian/libtbb2.install @@ -1 +1,2 @@ -build/linux_*_release/lib*.so.* usr/lib +#! /usr/bin/dh-exec +build/linux_*_release/lib*.so.* usr/lib/${DEB_HOST_MULTIARCH} diff --git a/tbb-4.2~20140122/debian/rules b/marc/debian/rules index 0e0296c..7c95052 100755 --- a/tbb-4.2~20140122/debian/rules +++ b/marc/debian/rules @@ -13,7 +13,7 @@ CXXFLAGS+=$(CPPFLAGS) VERSION = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-) debian/tbb.pc: debian/tbb.pc.in - sed -e"s/@VERSION@/$(VERSION)/g" $< > $@ + sed -e"s/@VERSION@/$(VERSION)/g;s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g" $< > $@ build-arch: debian/tbb.pc diff --git a/tbb-4.2~20140122/debian/tbb-examples.README.Debian b/marc/debian/tbb-examples.README.Debian index a8742ca..884abed 100644 --- a/tbb-4.2~20140122/debian/tbb-examples.README.Debian +++ b/marc/debian/tbb-examples.README.Debian @@ -4,7 +4,7 @@ tbb for Debian This is the Intel Threading Building Blocks package. It comes from the "Commercial Aligned Release" series of TBB releases. -This package ships a pkg-config file in /usr/lib/pkgconfig/tbb.pc. Here is +This package ships a pkg-config file in /usr/lib/*/pkgconfig/tbb.pc. Here is an example of how it is used: gcc -o test test.c `pkg-config --libs --cflags tbb` diff --git a/tbb-4.2~20140122/debian/tbb.pc.in b/marc/debian/tbb.pc.in index 140fe33..6bcf5f8 100644 --- a/tbb-4.2~20140122/debian/tbb.pc.in +++ b/marc/debian/tbb.pc.in @@ -1,11 +1,11 @@ prefix=/usr exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=${exec_prefix}/lib/@DEB_HOST_MULTIARCH@ includedir=${prefix}/include Name: Threading Building Blocks Description: Intel's parallelism library for C++ URL: http://www.threadingbuildingblocks.org/ Version: @VERSION@ -Libs: -L${libdir} -ltbb -Cflags: -I${includedir} +Libs: -ltbb +Cflags:
