mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 06:06:32 +00:00
luaposix: bump to version 33.4.0
- 0001-sched-workaround-glibc-_POSIX_PRIORITY_SCHEDULING-bu.patch is removed because it was merged upstream. Since this patch is removed, autoreconfiguring the package is no longer needed. - the ncurses dependency is dropped because the ncurses-related functionality from luaposix was removed, and moved to a separate project. Signed-off-by: Francois Perrad <francois.perrad@gadz.org> [Thomas: write a proper commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
bed9d83dd0
commit
5fbce8f5cc
@ -1,59 +0,0 @@
|
|||||||
From de2a9b45e7b4a89affa3ac6d0a010cc627ab4a87 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Gary V. Vaughan" <gary@vaughan.pe>
|
|
||||||
Date: Mon, 6 Apr 2015 18:39:46 -0700
|
|
||||||
Subject: [PATCH 1/1] sched: workaround glibc _POSIX_PRIORITY_SCHEDULING bug.
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Close #223.
|
|
||||||
* configure.ac (AC_CHECK_HEADERS): Add sched.h.
|
|
||||||
* ext/posix/sched.c: Remove unistd.h; Predicate use of priority
|
|
||||||
scheduling APIs on presence of sched.h instead of
|
|
||||||
_POSIX_PRIORITY_SCHEDULING macro erroneously defined by glibc on
|
|
||||||
Linux.
|
|
||||||
Reported by ncopa@github.com.
|
|
||||||
|
|
||||||
Backported from: 11cc8a2973569ec7fb1e7c2466dca0282944b124
|
|
||||||
|
|
||||||
Signed-off-by: Gary V. Vaughan <gary@vaughan.pe>
|
|
||||||
[Backport]
|
|
||||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
|
||||||
---
|
|
||||||
configure.ac | 2 +-
|
|
||||||
ext/posix/sched.c | 5 +++--
|
|
||||||
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index aa18318..89a2feb 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -114,7 +114,7 @@ gl_INIT
|
|
||||||
|
|
||||||
## Check for header files
|
|
||||||
AC_HEADER_STDC
|
|
||||||
-AC_CHECK_HEADERS([crypt.h strings.h sys/statvfs.h])
|
|
||||||
+AC_CHECK_HEADERS([crypt.h sched.h strings.h sys/statvfs.h])
|
|
||||||
AC_CHECK_HEADERS([net/if.h linux/netlink.h], [], [], [
|
|
||||||
#include <sys/socket.h>
|
|
||||||
])
|
|
||||||
diff --git a/ext/posix/sched.c b/ext/posix/sched.c
|
|
||||||
index 13b196b..f338d73 100644
|
|
||||||
--- a/ext/posix/sched.c
|
|
||||||
+++ b/ext/posix/sched.c
|
|
||||||
@@ -21,9 +21,10 @@
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
-#include <unistd.h> /* for _POSIX_PRIORITY_SCHEDULING */
|
|
||||||
+/* cannot use unistd.h for _POSIX_PRIORITY_SCHEDULING, because on Linux
|
|
||||||
+ glibc it is defined even though the APIs are not implemented :-( */
|
|
||||||
|
|
||||||
-#ifdef _POSIX_PRIORITY_SCHEDULING
|
|
||||||
+#ifdef HAVE_SCHED_H
|
|
||||||
#include <sched.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
--
|
|
||||||
2.5.2
|
|
||||||
|
|
@ -1,15 +1,13 @@
|
|||||||
config BR2_PACKAGE_LUAPOSIX
|
config BR2_PACKAGE_LUAPOSIX
|
||||||
bool "luaposix"
|
bool "luaposix"
|
||||||
depends on BR2_PACKAGE_HAS_LUAINTERPRETER
|
depends on BR2_PACKAGE_HAS_LUAINTERPRETER
|
||||||
select BR2_PACKAGE_NCURSES
|
|
||||||
select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1
|
select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1
|
||||||
# LuaBitOp is already included in LuaJIT
|
# LuaBitOp is already included in LuaJIT
|
||||||
help
|
help
|
||||||
luaposix is a POSIX binding, including curses, for Lua 5.1,
|
This is a POSIX binding for LuaJIT, Lua 5.1, 5.2 and 5.3;
|
||||||
5.2 and 5.3; like most libraries it simply binds to C APIs on
|
like most libraries it simply binds to C APIs on the
|
||||||
the underlying system, so it won't work on non-POSIX
|
underlying system, so it won't work on non-POSIX systems.
|
||||||
systems. However, it does try to detect the level of POSIX
|
However, it does try to detect the level of POSIX conformance
|
||||||
conformance of the underlying system and bind only available
|
of the underlying system and bind only available APIs.
|
||||||
APIs.
|
|
||||||
|
|
||||||
https://github.com/luaposix/luaposix
|
https://github.com/luaposix/luaposix
|
||||||
|
@ -4,13 +4,11 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LUAPOSIX_VERSION = 33.3.1
|
LUAPOSIX_VERSION = 33.4.0
|
||||||
LUAPOSIX_SITE = $(call github,luaposix,luaposix,release-v$(LUAPOSIX_VERSION))
|
LUAPOSIX_SITE = $(call github,luaposix,luaposix,release-v$(LUAPOSIX_VERSION))
|
||||||
LUAPOSIX_LICENSE = MIT
|
LUAPOSIX_LICENSE = MIT
|
||||||
LUAPOSIX_LICENSE_FILES = COPYING
|
LUAPOSIX_LICENSE_FILES = COPYING
|
||||||
LUAPOSIX_DEPENDENCIES = luainterpreter host-lua ncurses
|
LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
|
||||||
# 0001-sched-workaround-glibc-_POSIX_PRIORITY_SCHEDULING-bu.patch
|
|
||||||
LUAPOSIX_AUTORECONF = YES
|
|
||||||
LUAPOSIX_CONF_OPTS = --libdir="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" --datarootdir="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
|
LUAPOSIX_CONF_OPTS = --libdir="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" --datarootdir="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
|
||||||
|
|
||||||
$(eval $(autotools-package))
|
$(eval $(autotools-package))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user