[tbb] 47/64: Imported Debian patch 4.2~20130725-1.4~exp2

[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 2101faf26ee3ca7bb4c8e35e119cc25662b760cc
Author: Mathieu Malaterre <malat at debian.org>
Date:   Wed Sep 18 10:31:59 2013 +0200

    Imported Debian patch 4.2~20130725-1.4~exp2
---
 debian/README.source             | 10 +++++++
 debian/changelog                 |  7 +++++
 debian/patches/fixnonlinux.patch | 62 +++++++++++++++++++++++++++++++++-------
 3 files changed, 68 insertions(+), 11 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 ff1ca60..6f78afb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tbb (4.2~20130725-1.4~exp2) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Fix buildd on x32/hurd/kFreeBSD
+
+ -- Mathieu Malaterre <malat at debian.org>  Wed, 18 Sep 2013 10:31:59 +0200
+
 tbb (4.2~20130725-1.3~exp2) experimental; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/patches/fixnonlinux.patch b/debian/patches/fixnonlinux.patch
index f0d7206..2cdb442 100644
--- a/debian/patches/fixnonlinux.patch
+++ b/debian/patches/fixnonlinux.patch
@@ -1,7 +1,10 @@
+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-09-11 14:09:31.448814938 +0200
-+++ tbb-4.2~20130725/build/common.inc	2013-09-11 14:10:39.420814346 +0200
+--- tbb-4.2~20130725.orig/build/common.inc	2013-09-18 10:30:03.399660045 +0200
++++ tbb-4.2~20130725/build/common.inc	2013-09-18 10:30:23.927659866 +0200
 @@ -41,6 +41,14 @@
    ifeq ($(OS), Linux)
      export tbb_os=linux
@@ -19,9 +22,19 @@ Index: tbb-4.2~20130725/build/common.inc
    endif
 Index: tbb-4.2~20130725/build/linux.inc
 ===================================================================
---- tbb-4.2~20130725.orig/build/linux.inc	2013-09-11 14:11:48.684813742 +0200
-+++ tbb-4.2~20130725/build/linux.inc	2013-09-12 12:39:01.468109446 +0200
-@@ -59,7 +59,7 @@
+--- tbb-4.2~20130725.orig/build/linux.inc	2013-09-18 10:30:23.199659872 +0200
++++ tbb-4.2~20130725/build/linux.inc	2013-09-18 10:30:23.927659866 +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,7 +62,7 @@
                  export arch:=intel64
          endif
          ifeq ($(uname_m),sparc64)
@@ -30,7 +43,7 @@ Index: tbb-4.2~20130725/build/linux.inc
          endif
          ifeq ($(uname_m),armv71)
                  export arch:=armv7
-@@ -67,6 +67,12 @@
+@@ -67,6 +70,12 @@
          ifeq ($(uname_m),armv7l)
                  export arch:=armv7
          endif
@@ -38,12 +51,12 @@ Index: tbb-4.2~20130725/build/linux.inc
 +                export arch:=ppc32
 +        endif
 +        ifeq ($(deb_host_arch),x32)
-+                export arch:=ia32
++                export arch:=x32
 +        endif
          ifndef arch
                  export arch:=$(uname_m)
                  $(warning "Unknown arch: " $(arch))
-@@ -115,7 +121,7 @@
+@@ -115,7 +124,7 @@
  ifeq ($(arch),ia64)
          def_prefix = lin64ipf
  endif
@@ -54,9 +67,20 @@ Index: tbb-4.2~20130725/build/linux.inc
  ifeq ($(arch),armv7)
 Index: tbb-4.2~20130725/build/linux.gcc.inc
 ===================================================================
---- tbb-4.2~20130725.orig/build/linux.gcc.inc	2013-09-11 14:14:34.620812296 +0200
-+++ tbb-4.2~20130725/build/linux.gcc.inc	2013-09-11 14:14:45.852812198 +0200
-@@ -110,7 +110,7 @@
+--- tbb-4.2~20130725.orig/build/linux.gcc.inc	2013-09-18 10:30:03.423660043 +0200
++++ tbb-4.2~20130725/build/linux.gcc.inc	2013-09-18 10:30:23.927659866 +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)
@@ -65,3 +89,19 @@ Index: tbb-4.2~20130725/build/linux.gcc.inc
      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-09-18 10:30:03.367660045 +0200
++++ tbb-4.2~20130725/build/FreeBSD.inc	2013-09-18 10:30:23.927659866 +0200
+@@ -34,6 +34,11 @@
+         ifeq ($(shell 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

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