summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-09-02 10:35:57 -0700
committerKhem Raj <raj.khem@gmail.com>2018-09-05 08:04:22 -0700
commitc637d4c64f9a0547e65124e0d08e7afb165215b5 (patch)
tree434d5d203f06fce2233d7b9db9ba1b50f6ba506c /meta-oe
parentba82e1b5ec9a885ef3e554af917b8db5982e59d3 (diff)
downloadmeta-openembedded-c637d4c64f9a0547e65124e0d08e7afb165215b5.tar.gz
jack: Fix build with python 3.7+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch26
-rw-r--r--meta-oe/recipes-multimedia/jack/jack_git.bb4
2 files changed, 29 insertions, 1 deletions
diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch b/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch
new file mode 100644
index 000000000..e6021cd70
--- /dev/null
+++ b/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch
@@ -0,0 +1,26 @@
1From 72564b04151b61fa8d954bbb43afc58108ee50ec Mon Sep 17 00:00:00 2001
2From: Thomas Nagy <tnagy@waf.io>
3Date: Mon, 12 Mar 2018 20:42:55 +0100
4Subject: [PATCH] Python 3.7 fixes #2126
5
6Upstream-Status: Backport
7[https://gitlab.com/ita1024/waf/commit/facdc0b173d933073832c768ec1917c553cb369c]
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 waflib/Node.py | 2 --
12 1 file changed, 2 deletions(-)
13
14diff --git a/waflib/Node.py b/waflib/Node.py
15index fb3cd273..405a6fec 100644
16--- a/waflib/Node.py
17+++ b/waflib/Node.py
18@@ -537,8 +537,6 @@ class Node(object):
19 if maxdepth:
20 for k in node.ant_iter(accept=accept, maxdepth=maxdepth - 1, pats=npats, dir=dir, src=src, remove=remove):
21 yield k
22- raise StopIteration
23-
24 def ant_glob(self, *k, **kw):
25 """
26 This method is used for finding files across folders. It behaves like ant patterns:
diff --git a/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-oe/recipes-multimedia/jack/jack_git.bb
index 11da6b1be..52559cb36 100644
--- a/meta-oe/recipes-multimedia/jack/jack_git.bb
+++ b/meta-oe/recipes-multimedia/jack/jack_git.bb
@@ -14,7 +14,9 @@ LIC_FILES_CHKSUM = " \
14 14
15DEPENDS = "libsamplerate0 libsndfile1 readline" 15DEPENDS = "libsamplerate0 libsndfile1 readline"
16 16
17SRC_URI = "git://github.com/jackaudio/jack2.git" 17SRC_URI = "git://github.com/jackaudio/jack2.git \
18 file://0001-Python-3.7-fixes-2126.patch \
19 "
18SRCREV = "c1647819eed6d11f94b21981d9c869629299f357" 20SRCREV = "c1647819eed6d11f94b21981d9c869629299f357"
19PV = "1.9.12" 21PV = "1.9.12"
20S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"