[SCM] jackd2/master: Drop obsolete hppa-parallel.patch
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Tue May 29 20:31:25 UTC 2012
The following commit has been merged in the master branch:
commit bd33757e254b4f7bab8c4be21f4cd7d4b8569c36
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Tue May 29 21:25:40 2012 +0200
Drop obsolete hppa-parallel.patch
Upstream is using waf-1.6 now, so the patch is no longer required.
diff --git a/debian/patches/hppa-parallel.patch b/debian/patches/hppa-parallel.patch
deleted file mode 100644
index 0904b64..0000000
--- a/debian/patches/hppa-parallel.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Description: Disable parallel build on hppa architecture.
-Bug-Debian: http://bugs.debian.org/580824
-Origin: http://code.google.com/p/waf/source/browse/tags/waf-1.5.0/playground/serial.py
-
---- a/wafadmin/Runner.py
-+++ b/wafadmin/Runner.py
-@@ -143,3 +143,100 @@
- self.consumers=[TaskConsumer(self)for i in xrange(self.numjobs)]
- assert(self.count==0 or self.stop)
-
-+class Serial(object):
-+
-+ def __init__(self, bld, j=1):
-+ self.manager = bld.task_manager
-+ self.outstanding = []
-+
-+ # progress bar
-+ self.total = self.manager.total()
-+ self.processed = 0
-+ self.error = 0
-+
-+ self.switchflag = 1 # postpone
-+
-+ self.consumers = None
-+
-+ # warning, this one is recursive ..
-+ def get_next(self):
-+ if self.outstanding:
-+ t = self.outstanding.pop(0)
-+ self.processed += 1
-+ return t
-+
-+ # handle case where only one wscript exist
-+ # that only install files
-+ if not self.manager.groups:
-+ return None
-+
-+ (_, self.outstanding) = self.manager.get_next_set()
-+ if not self.outstanding: return None
-+
-+ return self.get_next()
-+
-+ def postpone(self, tsk):
-+ self.processed -= 1
-+ self.switchflag *= -1
-+ # this actually shuffle the list
-+ if self.switchflag>0: self.outstanding.insert(0, tsk)
-+ else: self.outstanding.append(tsk)
-+
-+ def start(self):
-+ debug('runner: Serial start called')
-+ while 1:
-+ # get next Task
-+ tsk = self.get_next()
-+ if tsk is None: break
-+
-+ if Logs.verbose: debug('runner: retrieving %r' % tsk)
-+
-+ st = tsk.runnable_status()
-+ if st == ASK_LATER:
-+ debug('runner: postponing %r' % tsk)
-+ self.postpone(tsk)
-+ continue
-+
-+ #continue
-+ if st == SKIP_ME:
-+ tsk.hasrun = SKIPPED
-+ self.manager.add_finished(tsk)
-+ continue
-+
-+ tsk.position = (self.processed, self.total)
-+
-+ # display the command that we are about to run
-+ tsk.generator.bld.printout(tsk.display())
-+
-+ # run the command
-+ if tsk.__class__.stat: ret = tsk.__class__.stat(tsk)
-+ else: ret = tsk.run()
-+ self.manager.add_finished(tsk)
-+
-+ # non-zero means something went wrong
-+ if ret:
-+ self.error = 1
-+ tsk.hasrun = CRASHED
-+ tsk.err_code = ret
-+ if Options.options.keep: continue
-+ else: return -1
-+
-+ try:
-+ tsk.post_run()
-+ except OSError:
-+ self.error = 1
-+ tsk.hasrun = MISSING
-+ if Options.options.keep: continue
-+ else: return -1
-+ else:
-+ tsk.hasrun = SUCCESS
-+
-+ if self.error:
-+ return -1
-+
-+import subprocess
-+p = subprocess.Popen(['dpkg', '--print-architecture'], stdout=subprocess.PIPE)
-+arch = p.stdout.read().strip()
-+p.wait()
-+if arch == 'hppa':
-+ Parallel = Serial
--
jackd2 packaging
More information about the pkg-multimedia-commits
mailing list