[tbb] 43/64: Imported Debian patch 4.2~20130725-1.1
Graham Inggs
ginggs at moszumanska.debian.org
Mon Jul 3 12:28:01 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 718ab8b72132e9a42895b54b1a36f8cdbe6e18ec
Author: Mathieu Malaterre <malat at debian.org>
Date: Tue Oct 8 08:23:25 2013 +0000
Imported Debian patch 4.2~20130725-1.1
---
debian/README.source | 10 ++++
debian/changelog | 19 +++++--
debian/control | 6 +-
debian/patches/adddebug.patch | 13 +++--
debian/patches/armhf.patch | 14 +++--
debian/patches/fixnonlinux.patch | 118 +++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 8 ++-
debian/source/include-binaries | 71 -----------------------
debian/tbb.pc | 11 ----
10 files changed, 171 insertions(+), 100 deletions(-)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..18225c1
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,10 @@
+In order to build tbb on armhf, I had to patch upstream to replace a string
+matching from armv71 to armv7l. For more discussion see:
+
+http://bugs.debian.org/692033
+
+For client code to be able to use tbb on armhf, you will need to compile with:
+
+CXXFLAGS+=-Wa,-mimplicit-it=thumb
+
+ -- Mathieu Malaterre <malat at debian.org> Wed, 18 Sep 2013 09:22:27 +0200
diff --git a/debian/changelog b/debian/changelog
index 5102ea6..c5551a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,21 @@
-tbb (4.2~20130725-1.1~exp2) experimental; urgency=low
+tbb (4.2~20130725-1.1) unstable; urgency=low
* Non-maintainer upload.
- * New stable release: 4.2
- * Fix d/watch page to use new https redirection
+ * New upstream
+ * Fix buildds: x32/sparc/sparc64
+ * Do not compress Makefiles in tbb-examples
- -- Mathieu Malaterre <malat at debian.org> Mon, 09 Sep 2013 12:12:17 +0200
+ -- Mathieu Malaterre <malat at debian.org> Tue, 08 Oct 2013 08:23:25 +0000
+
+tbb (4.1~20130613-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix armhf buildd
+ + debian/patches/armhf.patch
+ * Fix hardening flags (missing CPPFLAGS)
+ * Fix d/watch file
+
+ -- Mathieu Malaterre <malat at debian.org> Wed, 18 Sep 2013 09:22:27 +0200
tbb (4.1~20130613-1.1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9e0b534..e17334f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Homepage: http://threadingbuildingblocks.org/
Package: libtbb-dev
Section: libdevel
-Architecture: i386 amd64 ia64 powerpc powerpcspe ppc64 x32 armhf
+Architecture: i386 amd64 ia64 powerpc powerpcspe ppc64 x32 armhf sparc sparc64
Depends: libtbb2 (= ${binary:Version}), ${misc:Depends}
Suggests: tbb-examples, libtbb-doc
Description: parallelism library for C++ - development files
@@ -25,7 +25,7 @@ Description: parallelism library for C++ - development files
This package includes the TBB development files.
Package: libtbb2
-Architecture: i386 amd64 ia64 powerpc powerpcspe ppc64 x32 armhf
+Architecture: i386 amd64 ia64 powerpc powerpcspe ppc64 x32 armhf sparc sparc64
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: parallelism library for C++ - runtime files
TBB is a library that helps you leverage multi-core processor
@@ -41,7 +41,7 @@ Description: parallelism library for C++ - runtime files
Package: libtbb2-dbg
Section: debug
-Architecture: i386 amd64 ia64 powerpc powerpcspe ppc64 x32 armhf
+Architecture: i386 amd64 ia64 powerpc powerpcspe ppc64 x32 armhf sparc sparc64
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/debian/patches/adddebug.patch b/debian/patches/adddebug.patch
index b3c07b7..dfeead8 100644
--- a/debian/patches/adddebug.patch
+++ b/debian/patches/adddebug.patch
@@ -1,20 +1,23 @@
Description: add debug info
Author: Mathieu Malaterre <malat at debian.org>
-Index: tbb42_20130725oss/build/linux.inc
+Index: tbb-4.2~20130725/build/linux.inc
===================================================================
---- tbb42_20130725oss.orig/build/linux.inc 2013-09-06 14:19:49.272573574 +0200
-+++ tbb42_20130725oss/build/linux.inc 2013-09-06 14:20:33.672573187 +0200
-@@ -44,6 +44,8 @@
+--- tbb-4.2~20130725.orig/build/linux.inc 2013-10-08 09:54:09.000000000 +0200
++++ tbb-4.2~20130725/build/linux.inc 2013-10-08 09:54:10.000000000 +0200
+@@ -44,6 +44,11 @@
ifndef arch
uname_m:=$(shell uname -m)
+ uname_a:=$(shell uname -a)
++ deb_host_arch:=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+ $(warning "uname_m: " $(uname_m))
++ $(warning "uname_a: " $(uname_a))
++ $(warning "deb_host_arch: " $(deb_host_arch))
ifeq ($(uname_m),i686)
export arch:=ia32
endif
-@@ -61,6 +63,8 @@
+@@ -61,6 +66,8 @@
endif
ifndef arch
export arch:=$(uname_m)
diff --git a/debian/patches/armhf.patch b/debian/patches/armhf.patch
index 2edd6d9..7da5232 100644
--- a/debian/patches/armhf.patch
+++ b/debian/patches/armhf.patch
@@ -1,13 +1,17 @@
-Description: remove whitespace in export
+Description: It looks like on debian armv7l is returned while armv71 seems to
+ be expected...
Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: http://bugs.debian.org/692033
---- tbb-4.2~20130725.orig/build/linux.inc
-+++ tbb-4.2~20130725/build/linux.inc
-@@ -57,7 +57,7 @@ ifndef arch
+--- tbb-4.1~20130613.orig/build/linux.inc
++++ tbb-4.1~20130613/build/linux.inc
+@@ -56,8 +56,8 @@ ifndef arch
+ ifeq ($(uname_m),sparc64)
export arch:=sparc
endif
- ifeq ($(uname_m),armv71)
+- ifeq ($(uname_m),armv71)
- export arch :=armv7
++ ifeq ($(uname_m),armv7l)
+ export arch:=armv7
endif
ifndef arch
diff --git a/debian/patches/fixnonlinux.patch b/debian/patches/fixnonlinux.patch
new file mode 100644
index 0000000..9bd1dd0
--- /dev/null
+++ b/debian/patches/fixnonlinux.patch
@@ -0,0 +1,118 @@
+Description: tweak system inspection to build on hurd/kFreeBSD/x32 systems
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: tbb-4.2~20130725/build/common.inc
+===================================================================
+--- tbb-4.2~20130725.orig/build/common.inc 2013-10-08 09:54:04.000000000 +0200
++++ tbb-4.2~20130725/build/common.inc 2013-10-08 09:54:14.000000000 +0200
+@@ -41,6 +41,14 @@
+ ifeq ($(OS), Linux)
+ export tbb_os=linux
+ endif
++ # hurd-386
++ ifeq ($(OS), GNU)
++ export tbb_os=linux
++ endif
++ # kfreebsd-*
++ ifeq ($(OS), GNU/kFreeBSD)
++ export tbb_os=FreeBSD
++ endif
+ ifeq ($(OS), Darwin)
+ export tbb_os=macos
+ endif
+Index: tbb-4.2~20130725/build/linux.inc
+===================================================================
+--- tbb-4.2~20130725.orig/build/linux.inc 2013-10-08 09:54:10.000000000 +0200
++++ tbb-4.2~20130725/build/linux.inc 2013-10-08 09:54:14.000000000 +0200
+@@ -52,6 +52,9 @@
+ ifeq ($(uname_m),i686)
+ export arch:=ia32
+ endif
++ ifeq ($(uname_m),i686-AT386)
++ export arch:=ia32
++ endif
+ ifeq ($(uname_m),ia64)
+ export arch:=ia64
+ endif
+@@ -59,11 +62,17 @@
+ export arch:=intel64
+ endif
+ ifeq ($(uname_m),sparc64)
+- export arch:=sparc
++ export arch:=sparc64
+ endif
+ ifeq ($(uname_m),armv7l)
+ export arch:=armv7
+ endif
++ ifeq ($(uname_m),ppc)
++ export arch:=ppc32
++ endif
++ ifeq ($(deb_host_arch),x32)
++ export arch:=x32
++ endif
+ ifndef arch
+ export arch:=$(uname_m)
+ $(warning "Unknown arch: " $(arch))
+@@ -112,7 +121,7 @@
+ ifeq ($(arch),ia64)
+ def_prefix = lin64ipf
+ endif
+-ifeq ($(arch),sparc)
++ifeq ($(arch),sparc64)
+ def_prefix = lin64
+ endif
+ ifeq ($(arch),armv7)
+Index: tbb-4.2~20130725/build/linux.gcc.inc
+===================================================================
+--- tbb-4.2~20130725.orig/build/linux.gcc.inc 2013-10-08 09:54:04.000000000 +0200
++++ tbb-4.2~20130725/build/linux.gcc.inc 2013-10-08 09:54:14.000000000 +0200
+@@ -104,13 +104,18 @@
+ LIB_LINK_FLAGS += -m32
+ endif
+
++ifeq (x32,$(arch))
++ CPLUS_FLAGS += -mx32
++ LIB_LINK_FLAGS += -mx32
++endif
++
+ ifeq (bgp,$(arch))
+ CPLUS = mpicxx
+ CONLY = mpicc
+ endif
+
+ # for some gcc versions on Solaris, -m64 may imply V9, but perhaps not everywhere (TODO: verify)
+-ifeq (sparc,$(arch))
++ifeq (sparc64,$(arch))
+ CPLUS_FLAGS += -mcpu=v9 -m64
+ LIB_LINK_FLAGS += -mcpu=v9 -m64
+ endif
+Index: tbb-4.2~20130725/build/FreeBSD.inc
+===================================================================
+--- tbb-4.2~20130725.orig/build/FreeBSD.inc 2013-10-08 09:54:04.000000000 +0200
++++ tbb-4.2~20130725/build/FreeBSD.inc 2013-10-08 09:54:14.000000000 +0200
+@@ -25,15 +25,22 @@
+ # the GNU General Public License.
+
+ ifndef arch
+- ifeq ($(shell uname -m),i386)
++ uname_m:=$(shell uname -m)
++ uname_a:=$(shell uname -a)
++ ifeq ($(uname_m),i386)
+ export arch:=ia32
+ endif
+- ifeq ($(shell uname -m),ia64)
++ ifeq ($(uname_m),ia64)
+ export arch:=ia64
+ endif
+- ifeq ($(shell uname -m),amd64)
++ ifeq ($(uname_m),amd64)
+ export arch:=intel64
+ endif
++ ifndef arch
++ export arch:=$(uname_m)
++ $(warning "FreeBSD Unknown arch: " $(arch))
++ $(warning "FreeBSD Unknown uname_a: " $(uname_a))
++ endif
+ endif
+
+ ifndef runtime
diff --git a/debian/patches/series b/debian/patches/series
index 39487a7..78f65d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
armhf.patch
adddebug.patch
+fixnonlinux.patch
diff --git a/debian/rules b/debian/rules
index 1cc4930..0e0296c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
+CFLAGS+=$(CPPFLAGS)
+CXXFLAGS+=$(CPPFLAGS)
%:
dh $@ --parallel --dbg-package=libtbb2-dbg
@@ -13,7 +15,11 @@ VERSION = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f
debian/tbb.pc: debian/tbb.pc.in
sed -e"s/@VERSION@/$(VERSION)/g" $< > $@
-build: debian/tbb.pc
+build-arch: debian/tbb.pc
+
+# Makefiles should not be compressed (tbb-examples)
+override_dh_compress-indep:
+ dh_compress -X*/examples/*
get-orig-source:
uscan --verbose --force-download --rename
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
deleted file mode 100644
index 785457b..0000000
--- a/debian/source/include-binaries
+++ /dev/null
@@ -1,71 +0,0 @@
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/arena.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/cache_aligned_allocator.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/concurrent_hash_map.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/concurrent_monitor.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/concurrent_queue.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/concurrent_queue_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/concurrent_vector.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/concurrent_vector_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/condition_variable.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/critical_section.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/dynamic_link.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/governor.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/itt_notify.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/libtbb_debug.so.2
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/market.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/observer_proxy.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/pipeline.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/private_server.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/queuing_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/queuing_rw_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/reader_writer_lock.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/recursive_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/rml_tbb.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/scheduler.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/semaphore.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/spin_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/spin_rw_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/spin_rw_mutex_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/task.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/task_group_context.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/task_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/tbb_main.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/tbb_misc.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/tbb_misc_ex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/tbb_statistics.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_debug/tbb_thread.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/arena.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/cache_aligned_allocator.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/concurrent_hash_map.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/concurrent_monitor.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/concurrent_queue.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/concurrent_queue_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/concurrent_vector.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/concurrent_vector_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/condition_variable.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/critical_section.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/dynamic_link.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/governor.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/itt_notify.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/market.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/observer_proxy.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/pipeline.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/private_server.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/queuing_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/queuing_rw_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/reader_writer_lock.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/recursive_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/rml_tbb.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/semaphore.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/spin_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/spin_rw_mutex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/spin_rw_mutex_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/task.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/task_group_context.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/task_v2.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/tbb_main.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/tbb_misc_ex.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/tbb_statistics.o
-build/linux_intel64_gcc_cc4.4.5_libc2.11.3_kernel3.2.0_release/tbb_thread.o
diff --git a/debian/tbb.pc b/debian/tbb.pc
deleted file mode 100644
index c2b95e0..0000000
--- a/debian/tbb.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Threading Building Blocks
-Description: Intel's parallelism library for C++
-URL: http://www.threadingbuildingblocks.org/
-Version: 4.1~20130516
-Libs: -L${libdir} -ltbb
-Cflags: -I${includedir}
--
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