浏览代码

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 <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fabrice Fontaine 2 年之前
父节点
当前提交
3bac7eb69d
共有 1 个文件被更改,包括 29 次插入0 次删除
  1. 29 0
      package/janet/0001-Update-for-more-minimal-builds.patch

+ 29 - 0
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 <calsrose@gmail.com>
+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 <fontaine.fabrice@gmail.com>
+---
+ 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