[tbb] 39/64: Imported Debian patch 4.1~20130613-1.2

[Graham Inggs]

This is an automated email from the git hooks/post-receive script.

ginggs pushed a commit to branch master
in repository tbb.

commit 002893310018b6e556c77551b97d605454c35f76
Author: Mathieu Malaterre <malat at debian.org>
Date:   Wed Sep 18 09:22:27 2013 +0200

    Imported Debian patch 4.1~20130613-1.2
---
 debian/README.source       | 10 ++++++++++
 debian/changelog           | 10 ++++++++++
 debian/patches/armhf.patch | 18 ++++++++++++++++++
 debian/patches/series      |  1 +
 debian/rules               |  4 +++-
 debian/tbb.pc              | 11 -----------
 debian/watch               |  4 ++--
 7 files changed, 44 insertions(+), 14 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 4150395..0b0b043 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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
 
   * Non-maintainer upload.
diff --git a/debian/patches/armhf.patch b/debian/patches/armhf.patch
new file mode 100644
index 0000000..7da5232
--- /dev/null
+++ b/debian/patches/armhf.patch
@@ -0,0 +1,18 @@
+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.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)
+-                export arch :=armv7
++        ifeq ($(uname_m),armv7l)
++                export arch:=armv7
+         endif
+         ifndef arch
+                 export arch:=$(uname_m)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f55e1a9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+armhf.patch
diff --git a/debian/rules b/debian/rules
index 1cc4930..7abcbfe 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,7 @@ 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
 
 get-orig-source:
 	uscan --verbose --force-download --rename
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} 
diff --git a/debian/watch b/debian/watch
index 8b26604..d9350c1 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 opts=dversionmangle=s/^(\d)(\d)~(\d{8})/$1$2_$3/,uversionmangle=s/(\d)(\d)_(\d{8})/$1.$2~$3/ \
-http://threadingbuildingblocks.org/download \
-http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb([0-9_]+)oss_src\.tgz
+https://www.threadingbuildingblocks.org/download \
+https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb([0-9_]+)oss_src\.tgz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tbb.git