* [Buildroot] [PATCH] package/copas: avoid to load module coxpocall with LuaJIT
@ 2019-04-07 8:59 Francois Perrad
2019-04-07 13:18 ` Thomas Petazzoni
2019-04-14 20:29 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Francois Perrad @ 2019-04-07 8:59 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
...0001-Do-not-load-coxpcall-for-LuaJIT.patch | 49 +++++++++++++++++++
package/copas/Config.in | 2 +-
2 files changed, 50 insertions(+), 1 deletion(-)
create mode 100644 package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch
diff --git a/package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch b/package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch
new file mode 100644
index 000000000..9a7f38c61
--- /dev/null
+++ b/package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch
@@ -0,0 +1,49 @@
+From 8d1b5a9b973a9891d676dabf31807eb825d7f262 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Perrad?= <francois.perrad@gadz.org>
+Date: Wed, 6 Sep 2017 00:00:56 +0200
+Subject: [PATCH] Do not load coxpcall for LuaJIT
+
+* coxpcall is only required with PUC Lua 5.1, but not with LuaJIT
+
+use the same logic as in copas.lua.
+this fixes issue #63.
+
+Fetch from: https://github.com/keplerproject/copas/commit/8d1b5a9b973a9891d676dabf31807eb825d7f262
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+---
+ doc/us/index.html | 5 +++++
+ src/copas/limit.lua | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/copas-2_0_2/doc/us/index.html b/doc/us/index.html
+index 1d008c2..c4d85ef 100644
+--- a/copas-2_0_2/doc/us/index.html
++++ b/copas-2_0_2/doc/us/index.html
+@@ -114,6 +114,11 @@ LuaSocket, <a href="http://keplerproject.github.io/coxpcall/">Coxpcall</a> (only
+ <h2><a name="history"></a>History</h2>
+
+ <dl class="history">
++ <dt><strong>Copas</strong> [unreleased]</dt>
++ <dd><ul>
++ <li>Fixed: coxpcall dependency in limit.lua #63 (Francois Perrad)</li>
++ </ul></dd>
++
+ <dt><strong>Copas 2.0.2</strong> [2017]</dt>
+ <dd><ul>
+ <li>Added: <code>copas.running</code> flag</li>
+diff --git a/copas-2_0_2/src/copas/limit.lua b/src/copas/limit.lua
+index ea178be..f0dfe17 100644
+--- a/copas-2_0_2/src/copas/limit.lua
++++ b/copas-2_0_2/src/copas/limit.lua
+@@ -10,7 +10,7 @@ local pack = table.pack or function(...) return {n=select('#',...),...} end
+ local unpack = function(t) return (table.unpack or unpack)(t, 1, t.n or #t) end
+
+ local pcall = pcall
+-if _VERSION=="Lua 5.1" then -- obsolete: only for Lua 5.1 compatibility
++if _VERSION=="Lua 5.1" and not jit then -- obsolete: only for Lua 5.1 compatibility
+ pcall = require("coxpcall").pcall
+ end
+
+--
+2.17.1
+
diff --git a/package/copas/Config.in b/package/copas/Config.in
index f4e05ea21..2de196710 100644
--- a/package/copas/Config.in
+++ b/package/copas/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_COPAS
bool "copas"
- select BR2_PACKAGE_COXPCALL if BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT # runtime
+ select BR2_PACKAGE_COXPCALL if BR2_PACKAGE_LUA_5_1 # runtime
select BR2_PACKAGE_LUASOCKET # runtime
help
Copas is a dispatcher based on coroutines that can be used
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] package/copas: avoid to load module coxpocall with LuaJIT
2019-04-07 8:59 [Buildroot] [PATCH] package/copas: avoid to load module coxpocall with LuaJIT Francois Perrad
@ 2019-04-07 13:18 ` Thomas Petazzoni
2019-04-14 20:29 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2019-04-07 13:18 UTC (permalink / raw)
To: buildroot
On Sun, 7 Apr 2019 10:59:07 +0200
Francois Perrad <fperrad@gmail.com> wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> ...0001-Do-not-load-coxpcall-for-LuaJIT.patch | 49 +++++++++++++++++++
> package/copas/Config.in | 2 +-
> 2 files changed, 50 insertions(+), 1 deletion(-)
> create mode 100644 package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] package/copas: avoid to load module coxpocall with LuaJIT
2019-04-07 8:59 [Buildroot] [PATCH] package/copas: avoid to load module coxpocall with LuaJIT Francois Perrad
2019-04-07 13:18 ` Thomas Petazzoni
@ 2019-04-14 20:29 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2019-04-14 20:29 UTC (permalink / raw)
To: buildroot
>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Committed to 2019.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-14 20:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-07 8:59 [Buildroot] [PATCH] package/copas: avoid to load module coxpocall with LuaJIT Francois Perrad
2019-04-07 13:18 ` Thomas Petazzoni
2019-04-14 20:29 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.