[tbb] 01/03: Fixup 64-bits detection patch

[Steven Capper]

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

capper-guest pushed a commit to branch steve-staging
in repository tbb.

commit c60a44961123464f72494186b13eb2db47314bbd
Author: Steve Capper <steven.capper at gmail.com>
Date:   Tue Jul 25 18:56:28 2017 +0100

    Fixup 64-bits detection patch
    
    I didn't quite get this right with 2017~U7 rebase. Also add alpha.
---
 debian/patches/series                        |  2 +-
 debian/patches/tweak-64bits-hppa-alpha.patch | 17 +++++++++++++++++
 debian/patches/tweak-64bits-s390-hppa.patch  | 20 --------------------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index c30af1f..aa2c432 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,7 @@ linuxreleasedetect.patch
 tally-unit-test-fails.patch
 gcc-atomic-detection.patch
 gcc-atomic-always.patch
-tweak-64bits-s390-hppa.patch
+tweak-64bits-hppa-alpha.patch
 removejsquery.patch
 cross.patch
 fix-armel.patch
diff --git a/debian/patches/tweak-64bits-hppa-alpha.patch b/debian/patches/tweak-64bits-hppa-alpha.patch
new file mode 100644
index 0000000..003e5df
--- /dev/null
+++ b/debian/patches/tweak-64bits-hppa-alpha.patch
@@ -0,0 +1,17 @@
+Description: Tweak 64 bits detection
+Author: Mathieu Malaterre <malat at debian.org>
+[Steve Capper: rebase to 2017~U7, rename hppa to parisc and add alpha]
+
+Index: tbb/build/linux.inc
+===================================================================
+--- tbb.orig/build/linux.inc
++++ tbb/build/linux.inc
+@@ -118,7 +118,7 @@ SONAME_SUFFIX =$(shell grep TBB_COMPATIB
+ ifeq ($(arch),ia64)
+         def_prefix = lin64ipf
+ endif
+-ifneq (,$(findstring $(arch),sparc s390x))
++ifneq (,$(findstring $(arch),sparc s390x parisc64 alpha))
+         def_prefix = lin64
+ endif
+ ifeq ($(arch),armv7)
diff --git a/debian/patches/tweak-64bits-s390-hppa.patch b/debian/patches/tweak-64bits-s390-hppa.patch
deleted file mode 100644
index 6d2262a..0000000
--- a/debian/patches/tweak-64bits-s390-hppa.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Tweak 64 bits detection
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: tbb-2017~U7/build/linux.inc
-===================================================================
---- tbb-2017~U7.orig/build/linux.inc
-+++ tbb-2017~U7/build/linux.inc
-@@ -121,6 +121,12 @@ endif
- ifneq (,$(findstring $(arch),sparc s390x))
-         def_prefix = lin64
- endif
-+ifeq ($(arch),s390x)
-+	def_prefix = lin64
-+endif
-+ifeq ($(arch),hppa)
-+	def_prefix = lin64
-+endif
- ifeq ($(arch),armv7)
-         def_prefix = lin32
- endif

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