mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-04-30 04:47:28 -07:00
Add missing die run epatch with multiple patches at once Package-Manager: portage-2.2.23 Signed-off-by: Justin Lecher <jlec@gentoo.org>
38 lines
973 B
Diff
38 lines
973 B
Diff
Description: Follow up to 80_fix-pickle.patch. Just disable pickling
|
|
altogether since the previous patch doesn't really fix the problem, and not
|
|
storing the pickle seems to have no adverse effects on the build, while
|
|
avoiding the observed traceback.
|
|
Author: Barry Warsaw <barry@debian.org>
|
|
Forwarded: no
|
|
|
|
--- a/waflib/Build.py
|
|
+++ b/waflib/Build.py
|
|
@@ -151,6 +151,7 @@
|
|
f.close()
|
|
self.init_dirs()
|
|
def store(self):
|
|
+ return
|
|
data={}
|
|
for x in SAVED_ATTRS:
|
|
data[x]=getattr(self,x)
|
|
--- a/waflib/Context.py
|
|
+++ b/waflib/Context.py
|
|
@@ -51,8 +51,6 @@
|
|
global classes
|
|
classes.insert(0,cls)
|
|
ctx=store_context('ctx',(object,),{})
|
|
-class node_class(waflib.Node.Node):
|
|
- pass
|
|
class Context(ctx):
|
|
errors=Errors
|
|
tools={}
|
|
@@ -62,6 +60,8 @@
|
|
except KeyError:
|
|
global run_dir
|
|
rd=run_dir
|
|
+ class node_class(waflib.Node.Node):
|
|
+ pass
|
|
self.node_class=node_class
|
|
self.node_class.__module__="waflib.Node"
|
|
self.node_class.__name__="Nod3"
|