diff options
author | Boris Nagaev <bnagaev@gmail.com> | 2016-01-01 12:31:37 (GMT) |
---|---|---|
committer | Boris Nagaev <bnagaev@gmail.com> | 2016-01-01 12:44:54 (GMT) |
commit | 3ecfb20f826ac6ac18d217c78c0d341b42567e55 (patch) | |
tree | aef14b42cbf4389d03d2b3c2deb53a7513fb89fb /src/jack-1-fixes.patch | |
parent | 779f2c0a12bd3d73223c4e5ca525318555d30bc1 (diff) | |
download | mxe-3ecfb20f826ac6ac18d217c78c0d341b42567e55.zip mxe-3ecfb20f826ac6ac18d217c78c0d341b42567e55.tar.gz mxe-3ecfb20f826ac6ac18d217c78c0d341b42567e55.tar.bz2 |
fix jack build for python3.5
Diffstat (limited to 'src/jack-1-fixes.patch')
-rw-r--r-- | src/jack-1-fixes.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/src/jack-1-fixes.patch b/src/jack-1-fixes.patch index dcadf4e..b19423d 100644 --- a/src/jack-1-fixes.patch +++ b/src/jack-1-fixes.patch @@ -186,3 +186,41 @@ index 1111111..2222222 100644 name = y.__name__.replace('Context','').lower() class tmp(y): cmd = name + '_' + lib32 + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev <bnagaev@gmail.com> +Date: Fri, 1 Jan 2016 15:21:46 +0300 +Subject: [PATCH] waf: disable function causing pickling errors + +According to Debian patch of py3cairo which also uses waf [1], + +80_fix pickle.patch: +> during the build process, a context instance is pickled, or at +> least attempted to be. This fails because self.node_class is assigned to a +> class which is nested inside the __init__() method. Because Python cannot +> find this class at unpickling time (i.e. it cannot be imported), Python +> refuses to pickle the Context instance, leading to a FTBFS. Since there's no +> obvious reason why the class has to be so nested, moving it to a module +> global solves the build failure. + +81_pickling again.patch: +> 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. + +[1] http://sources.debian.net/patches/summary/py3cairo/1.10.0+dfsg-5/ + +diff --git a/waf b/waf +index 1111111..2222222 100755 +--- a/waf ++++ b/waf +@@ -158,6 +158,8 @@ sys.path.insert(0, wafdir) + if __name__ == '__main__': + import waflib.extras.compat15 + from waflib import Scripting ++ from waflib import Build ++ Build.BuildContext.store = lambda self: True + Scripting.waf_entry_point(cwd, VERSION, wafdir) + + #==> |