From 3bac7eb69d8a9141e11076628df78ddffae349ba Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 Feb 2023 16:48:45 +0100 Subject: [PATCH] package/janet: fix build without threads Fix the following build failure without threads raised since bump to version 1.26.0 in commit 5c6f32bd255fc97823d464beacfa905a141066ec: ffi.c:(.text+0x9d8): undefined reference to `janet_abstract_threaded' Fixes: - http://autobuild.buildroot.org/results/20108e76990d8af7f47d474eadbbea8562ef6728 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-Update-for-more-minimal-builds.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/janet/0001-Update-for-more-minimal-builds.patch diff --git a/package/janet/0001-Update-for-more-minimal-builds.patch b/package/janet/0001-Update-for-more-minimal-builds.patch new file mode 100644 index 0000000000..ba36a9beba --- /dev/null +++ b/package/janet/0001-Update-for-more-minimal-builds.patch @@ -0,0 +1,29 @@ +From 746ff5307d309536984b648460e7b5c5dac44453 Mon Sep 17 00:00:00 2001 +From: Calvin Rose +Date: Sun, 12 Feb 2023 12:14:11 -0600 +Subject: [PATCH] Update for more minimal builds. + +[Retrieved (and backported) from: +https://github.com/janet-lang/janet/commit/746ff5307d309536984b648460e7b5c5dac44453] +Signed-off-by: Fabrice Fontaine +--- + src/core/ffi.c | 4 ++++ + src/core/marsh.c | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/core/ffi.c b/src/core/ffi.c +index 45a498c7..b453f1f6 100644 +--- a/src/core/ffi.c ++++ b/src/core/ffi.c +@@ -1311,7 +1311,11 @@ JANET_CORE_FN(cfun_ffi_jitfn, + size_t alloc_size = ((size_t) bytes.len + FFI_PAGE_MASK) & ~FFI_PAGE_MASK; + + #ifdef JANET_FFI_JIT ++#ifdef JANET_EV + JanetFFIJittedFn *fn = janet_abstract_threaded(&janet_type_ffijit, sizeof(JanetFFIJittedFn)); ++#else ++ JanetFFIJittedFn *fn = janet_abstract(&janet_type_ffijit, sizeof(JanetFFIJittedFn)); ++#endif + fn->function_pointer = NULL; + fn->size = 0; + #ifdef JANET_WINDOWS