diff options
| -rw-r--r-- | meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch | 37 | ||||
| -rw-r--r-- | meta-oe/recipes-multimedia/jack/jack_1.19.20.bb (renamed from meta-oe/recipes-multimedia/jack/jack_1.19.19.bb) | 6 |
2 files changed, 2 insertions, 41 deletions
diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch b/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch deleted file mode 100644 index 1bdc5adbc1..0000000000 --- a/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | From f8cb818ca96fc2a45a04448a51f25a277ec183db Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 15 Jan 2020 20:21:58 -0800 | ||
| 4 | Subject: [PATCH] example-clients: Use c++ compiler for jack_simdtests | ||
| 5 | |||
| 6 | It uses c++ sources and runtime therefore its best to use c++ compiler | ||
| 7 | to build it so it can find the correct runtime, cross compiling with | ||
| 8 | clang fails | ||
| 9 | |||
| 10 | x86_64-yoe-linux-ld: example-clients/simdtests.cpp.28.o: undefined reference to symbol '__cxa_call_unexpected@@CXXABI_1.3' | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/536] | ||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | example-clients/wscript | 9 +++++++-- | ||
| 16 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
| 17 | |||
| 18 | --- a/example-clients/wscript | ||
| 19 | +++ b/example-clients/wscript | ||
| 20 | @@ -49,10 +49,15 @@ def build(bld): | ||
| 21 | else: | ||
| 22 | use = ['clientlib'] | ||
| 23 | |||
| 24 | + if example_program == 'jack_simdtests': | ||
| 25 | + ftrs = 'cxx cxxprogram' | ||
| 26 | + else: | ||
| 27 | + ftrs = 'c cprogram' | ||
| 28 | + | ||
| 29 | if bld.env['IS_MACOSX']: | ||
| 30 | - prog = bld(features='c cprogram', framework = ['Foundation']) | ||
| 31 | + prog = bld(features = ftrs, framework = ['Foundation']) | ||
| 32 | else: | ||
| 33 | - prog = bld(features='c cprogram') | ||
| 34 | + prog = bld(features = ftrs) | ||
| 35 | prog.includes = os_incdir + ['../common/jack', '../common'] | ||
| 36 | prog.source = example_program_source | ||
| 37 | prog.use = use | ||
diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb b/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb index 97b0edeed0..452f066559 100644 --- a/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb +++ b/meta-oe/recipes-multimedia/jack/jack_1.19.20.bb | |||
| @@ -14,10 +14,8 @@ LIC_FILES_CHKSUM = " \ | |||
| 14 | 14 | ||
| 15 | DEPENDS = "libsamplerate0 libsndfile1 readline" | 15 | DEPENDS = "libsamplerate0 libsndfile1 readline" |
| 16 | 16 | ||
| 17 | SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https \ | 17 | SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https" |
| 18 | file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \ | 18 | SRCREV = "a2fe7ec2fdbd315f112c8035282d94a429451178" |
| 19 | " | ||
| 20 | SRCREV = "3e6ca6b734b69e2f5dfb85935068e15006fb5acf" | ||
| 21 | 19 | ||
| 22 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
| 23 | 21 | ||
