[tbb] 53/64: Imported Debian patch 4.2~20140122-2
Graham Inggs
ginggs at moszumanska.debian.org
Mon Jul 3 12:28:05 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 4559fb1697dbd74ed1b41e00ca7a7510ba59f978
Author: Steve Capper <steven.capper at gmail.com>
Date: Sat Jul 26 18:45:08 2014 +0100
Imported Debian patch 4.2~20140122-2
---
debian/changelog | 11 +++++++++++
debian/control | 2 +-
debian/patches/buildi386.patch | 34 +++++++++++++++++++++++++++++++++
debian/patches/failonbadtests.patch | 22 +++++++++++++++++++++
debian/patches/linuxreleasedetect.patch | 23 ++++++++++++++++++++++
debian/patches/series | 3 +++
debian/source.lintian-overrides | 7 +++++++
7 files changed, 101 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 86232d4..bb8a46b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tbb (4.2~20140122-2) unstable; urgency=medium
+
+ * Unit test compile errors no longer ignored. Closes: #752820
+ * for i386 architecture, set march=i586 (has to match gcc): Closes: #756233
+ * Debian architecture overrides uname -m, allows pbuilder i386 builds.
+ * Amended Linux kernel version detection logic to work with x.y.
+ * Bump standards version to 3.9.5.
+ * A couple of Lintian source-is-missing errors overridden.
+
+ -- Steve Capper <steven.capper at gmail.com> Sat, 26 Jul 2014 18:45:08 +0100
+
tbb (4.2~20140122-1.1) unstable; urgency=low
[ Helge Deller ]
diff --git a/debian/control b/debian/control
index 9dc785f..b9d51ce 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tbb
Priority: extra
Maintainer: Steve Capper <steven.capper at gmail.com>
Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), libjs-jquery
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Section: libs
Homepage: http://threadingbuildingblocks.org/
diff --git a/debian/patches/buildi386.patch b/debian/patches/buildi386.patch
new file mode 100644
index 0000000..fc85c4e
--- /dev/null
+++ b/debian/patches/buildi386.patch
@@ -0,0 +1,34 @@
+Description: allow i386 builds on amd64 and set march to match gcc
+Author: Steve Capper <steven.capper at gmail.com>
+
+Index: tbb/build/linux.gcc.inc
+===================================================================
+--- tbb.orig/build/linux.gcc.inc
++++ tbb/build/linux.gcc.inc
+@@ -93,7 +93,11 @@ endif
+
+ ifeq (ia32,$(arch))
+ ITT_NOTIFY = -DDO_ITT_NOTIFY
+- CPLUS_FLAGS += -m32 -march=pentium4 $(ENABLE_RTM)
++ ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),i386)
++ CPLUS_FLAGS += -m32 -march=i586 $(ENABLE_RTM)
++ else
++ CPLUS_FLAGS += -m32 -march=pentium4 $(ENABLE_RTM)
++ endif
+ LIB_LINK_FLAGS += -m32
+ endif
+
+Index: tbb/build/linux.inc
+===================================================================
+--- tbb.orig/build/linux.inc
++++ tbb/build/linux.inc
+@@ -73,6 +73,9 @@ ifndef arch
+ ifeq ($(deb_host_arch),x32)
+ export arch:=x32
+ endif
++ ifeq ($(deb_host_arch),i386)
++ export arch:=ia32
++ endif
+ ifndef arch
+ export arch:=$(uname_m)
+ $(warning "Unknown arch: " $(arch))
diff --git a/debian/patches/failonbadtests.patch b/debian/patches/failonbadtests.patch
new file mode 100644
index 0000000..114b67a
--- /dev/null
+++ b/debian/patches/failonbadtests.patch
@@ -0,0 +1,22 @@
+Description: Fail hard on serious unit test fails
+Author: Steve Capper <steven.capper at gmail.com>
+
+Index: tbb/Makefile
+===================================================================
+--- tbb.orig/Makefile
++++ tbb/Makefile
+@@ -49,10 +49,10 @@ tbbproxy: mkdir
+ $(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbbproxy cfg=release tbbproxy
+
+ test: tbb tbbmalloc $(if $(use_proxy),tbbproxy)
+- -$(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=debug malloc_test
+- -$(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.test cfg=debug
+- -$(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc_test
+- -$(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.test cfg=release
++ $(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=debug malloc_test
++ $(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.test cfg=debug
++ $(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc_test
++ $(MAKE) -C "$(work_dir)_release" -r -f $(tbb_root)/build/Makefile.test cfg=release
+
+ rml: mkdir
+ $(MAKE) -C "$(work_dir)_debug" -r -f $(tbb_root)/build/Makefile.rml cfg=debug
diff --git a/debian/patches/linuxreleasedetect.patch b/debian/patches/linuxreleasedetect.patch
new file mode 100644
index 0000000..ae23f14
--- /dev/null
+++ b/debian/patches/linuxreleasedetect.patch
@@ -0,0 +1,23 @@
+Description: detect linux x.y versions where x.y.z not found
+Author: Steve Capper <steven.capper at gmail.com>
+
+Index: tbb/src/test/harness.h
+===================================================================
+--- tbb.orig/src/test/harness.h
++++ tbb/src/test/harness.h
+@@ -602,9 +602,13 @@ inline unsigned LinuxKernelVersion()
+ REPORT_FATAL_ERROR("Can't call uname: errno %d\n", errno);
+ exit(1);
+ }
++
+ if (3 != sscanf(utsnameBuf.release, "%u.%u.%u", &digit1, &digit2, &digit3)) {
+- REPORT_FATAL_ERROR("Unable to parse OS release '%s'\n", utsnameBuf.release);
+- exit(1);
++ digit3 = 0;
++ if (2 != sscanf(utsnameBuf.release, "%u.%u", &digit1, &digit2)) {
++ REPORT_FATAL_ERROR("Unable to parse OS release '%s'\n", utsnameBuf.release);
++ exit(1);
++ }
+ }
+ return 1000000*digit1+1000*digit2+digit3;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index f6a7d16..7d6be14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,5 @@
adddebug.patch
fixnonlinux.patch
+failonbadtests.patch
+buildi386.patch
+linuxreleasedetect.patch
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..2dc5257
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,7 @@
+# Override this file as it is neither included in the final package
+# nor used in anyway during the build process
+tbb source: source-is-missing doc/help/searchdata.js
+
+# We do use jquery.js, but not this one. (We symlink to the jquery
+# package and make it a dependency).
+tbb source: source-is-missing doc/html/jquery.js
--
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