summaryrefslogtreecommitdiff
path: root/debian/patches/parallel_build.patch
diff options
context:
space:
mode:
authorJörg Frings-Fürst <jff@merkur>2014-07-26 11:45:47 +0200
committerJörg Frings-Fürst <jff@merkur>2014-07-26 11:45:47 +0200
commit7c6b954c00c2a2eed2e975ec797216c515cd249d (patch)
tree475c0ae1b3b3b8be085b54420894896688ea363c /debian/patches/parallel_build.patch
parent2176ae74d2f856582dd1e498a63a31949a7e19e2 (diff)
Imported Upstream version 2.3.2upstream/2.3.2
Diffstat (limited to 'debian/patches/parallel_build.patch')
-rw-r--r--debian/patches/parallel_build.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/debian/patches/parallel_build.patch b/debian/patches/parallel_build.patch
deleted file mode 100644
index 3af9a90..0000000
--- a/debian/patches/parallel_build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Disable parallel build on sparc machines
-Origin: Debian
-Bug-Debian: http://bugs.debian.org/632228
-Forwarded: no
-
-Index: scons/engine/SCons/Job.py
-===================================================================
---- scons.orig/engine/SCons/Job.py 2011-07-02 13:09:20.281651892 +0200
-+++ scons/engine/SCons/Job.py 2011-07-02 13:12:49.925651735 +0200
-@@ -83,7 +83,7 @@
- """
-
- self.job = None
-- if num > 1:
-+ if num > 1 and not self._check_sparc_machine():
- stack_size = explicit_stack_size
- if stack_size is None:
- stack_size = default_stack_size
-@@ -163,6 +163,19 @@
- except AttributeError:
- pass
-
-+ def _check_sparc_machine(self):
-+ """ Check whether machine is sparc"""
-+ try:
-+ from platform import machine
-+ except ImportError:
-+ pass
-+ else:
-+ if 'sparc' in machine():
-+ SCons.Warnings.warn(SCons.Warnings.StackSizeWarning,
-+ 'Parallel build disabled on sparc, '
-+ 'see Debian bug #632228')
-+ return True
-+
- class Serial(object):
- """This class is used to execute tasks in series, and is more efficient
- than Parallel, but is only appropriate for non-parallel builds. Only