diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-16 06:40:41 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-16 06:40:41 +0100 |
commit | 4ccb35c4f3d01c590735b3957b71839916c28b31 (patch) | |
tree | bb40e7e524abe23f56463bea2824bc3c1aa6d747 /debian/patches/0100-parallel_build.patch | |
parent | 60df8165e6be58369d76af4d38388c9846d82975 (diff) |
Refresh and rename patches
Diffstat (limited to 'debian/patches/0100-parallel_build.patch')
-rw-r--r-- | debian/patches/0100-parallel_build.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/debian/patches/0100-parallel_build.patch b/debian/patches/0100-parallel_build.patch new file mode 100644 index 0000000..3af9a90 --- /dev/null +++ b/debian/patches/0100-parallel_build.patch @@ -0,0 +1,38 @@ +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 |