Browse Source

Merge pull request #746 from mstorchak/luaposix

luaposix: update to v33.2.1
lilik-openwrt-22.03
Steven Barth 10 years ago
parent
commit
ccb1185fb6
3 changed files with 32 additions and 29 deletions
  1. +2
    -2
      lang/luaposix/Makefile
  2. +7
    -6
      lang/luaposix/patches/100-eglibc-compat.patch
  3. +23
    -21
      lang/luaposix/patches/101-disable-curses.patch

+ 2
- 2
lang/luaposix/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luaposix PKG_NAME:=luaposix
PKG_VERSION:=v33.0.0
PKG_VERSION:=v33.2.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=release-$(PKG_VERSION).tar.gz PKG_SOURCE:=release-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/luaposix/luaposix/archive/ PKG_SOURCE_URL:=https://github.com/luaposix/luaposix/archive/
PKG_MD5SUM:=3241c33566542b7563ae001112646af6
PKG_MD5SUM:=aa68b5c07ab1ecea81bb466c81e88056
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION)
PKG_REMOVE_FILES:=aclocal.m4 PKG_REMOVE_FILES:=aclocal.m4
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf


+ 7
- 6
lang/luaposix/patches/100-eglibc-compat.patch View File

@ -1,7 +1,8 @@
diff -Naur luaposix-release-v33.0.0.orig/ext/posix/unistd.c luaposix-release-v33.0.0/ext/posix/unistd.c
--- luaposix-release-v33.0.0.orig/ext/posix/unistd.c 2014-11-04 17:49:35.000000000 +0200
+++ luaposix-release-v33.0.0/ext/posix/unistd.c 2014-12-14 00:59:14.878622722 +0200
@@ -526,6 +526,7 @@
diff --git a/ext/posix/unistd.c b/ext/posix/unistd.c
index 9276640..69c8cef 100644
--- a/ext/posix/unistd.c
+++ b/ext/posix/unistd.c
@@ -525,6 +525,7 @@ Pgetgroups(lua_State *L)
#endif #endif
@ -9,7 +10,7 @@ diff -Naur luaposix-release-v33.0.0.orig/ext/posix/unistd.c luaposix-release-v33
/*** /***
Current logged-in user. Current logged-in user.
@treturn[1] string username, if successful @treturn[1] string username, if successful
@@ -538,6 +539,7 @@
@@ -537,6 +538,7 @@ Pgetlogin(lua_State *L)
checknargs(L, 0); checknargs(L, 0);
return pushstringresult(getlogin()); return pushstringresult(getlogin());
} }
@ -17,7 +18,7 @@ diff -Naur luaposix-release-v33.0.0.orig/ext/posix/unistd.c luaposix-release-v33
/*** /***
@@ -1037,7 +1039,9 @@
@@ -1044,7 +1046,9 @@ static const luaL_Reg posix_unistd_fns[] =
LPOSIX_FUNC( Pgetegid ), LPOSIX_FUNC( Pgetegid ),
LPOSIX_FUNC( Pgeteuid ), LPOSIX_FUNC( Pgeteuid ),
LPOSIX_FUNC( Pgetgid ), LPOSIX_FUNC( Pgetgid ),


+ 23
- 21
lang/luaposix/patches/101-disable-curses.patch View File

@ -1,22 +1,12 @@
diff -Naur luaposix-release-v33.0.0.orig/ext/posix/posix.c luaposix-release-v33.0.0/ext/posix/posix.c
--- luaposix-release-v33.0.0.orig/ext/posix/posix.c 2014-11-04 17:49:35.000000000 +0200
+++ luaposix-release-v33.0.0/ext/posix/posix.c 2014-12-14 01:49:44.486562194 +0200
@@ -11,7 +11,6 @@
*/
diff --git a/configure.ac b/configure.ac
index dfd4199..19924d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,15 +153,6 @@ AC_CHECK_LIB([rt], [clock_gettime])
AC_SUBST([LIBRT], [$LIBS])
LIBS=$save_LIBS
#include "ctype.c"
-#include "curses.c"
#include "dirent.c"
#include "errno.c"
#include "fcntl.c"
diff -Naur luaposix-release-v33.0.0.orig/configure.ac luaposix-release-v33.0.0/configure.ac
--- luaposix-release-v33.0.0.orig/configure.ac 2014-11-04 17:49:35.000000000 +0200
+++ luaposix-release-v33.0.0/configure.ac 2014-12-14 01:58:08.214554482 +0200
@@ -109,15 +109,6 @@
AC_SUBST([LIBRT], [-lrt])
fi
-dnl Curses
-## Curses
-AX_WITH_CURSES -AX_WITH_CURSES
-AC_ARG_VAR(CURSES_LIB, [linker flags for curses library]) -AC_ARG_VAR(CURSES_LIB, [linker flags for curses library])
- -
@ -25,6 +15,18 @@ diff -Naur luaposix-release-v33.0.0.orig/configure.ac luaposix-release-v33.0.0/c
-AC_CHECK_FUNCS([resizeterm]) -AC_CHECK_FUNCS([resizeterm])
-LIBS=$save_LIBS -LIBS=$save_LIBS
- -
dnl Lua 5.1 or 5.2
AX_PROG_LUA(5.1, 5.3)
AX_LUA_HEADERS
## Use system implementation, or bundled replacement?
AC_CHECK_FUNCS([strlcpy])
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 6019df0..2d75487 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -12,7 +12,6 @@
#include "bit32.c"
#include "ctype.c"
-#include "curses.c"
#include "dirent.c"
#include "errno.c"
#include "fcntl.c"

Loading…
Cancel
Save