Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

contrib/luaposix: Updated to 5.1.3

Browse source
This commit is contained in:
Steven Barth 2008-07-17 21:58:53 +00:00
parent fce0b84501
commit d9bcb87608
3 changed files with 8 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/luaposix/Makefile
View file

@ -1,8 +1,8 @@
include ../../build/config.mk include ../../build/config.mk
include ../../build/gccconfig.mk include ../../build/gccconfig.mk
LUAPOSIX_VERSION = 5.1.2 LUAPOSIX_VERSION = 5.1.3
LUAPOSIX_SITE = http://luaforge.net/frs/download.php/3063/ LUAPOSIX_SITE = http://luaforge.net/frs/download.php/3449/
LUAPOSIX_DIR = luaposix-$(LUAPOSIX_VERSION) LUAPOSIX_DIR = luaposix-$(LUAPOSIX_VERSION)
LUAPOSIX_FILE = $(LUAPOSIX_DIR).tar.gz LUAPOSIX_FILE = $(LUAPOSIX_DIR).tar.gz
LUAPOSIX_URL = $(LUAPOSIX_SITE)/$(LUAPOSIX_FILE) LUAPOSIX_URL = $(LUAPOSIX_SITE)/$(LUAPOSIX_FILE)

27
contrib/luaposix/patches/100-darwin_compile.patch
View file

@ -1,27 +0,0 @@
Index: luaposix-5.1.2/Makefile
===================================================================
--- luaposix-5.1.2.orig/Makefile 2008-01-29 14:49:27.000000000 +0100
+++ luaposix-5.1.2/Makefile 2008-05-28 14:15:30.000000000 +0200
@@ -34,6 +34,13 @@
T= $(MYLIB).so
+OS=$(shell uname)
+ifeq ($(OS),Darwin)
+ LDFLAGS_SHARED=-bundle -undefined dynamic_lookup
+else
+ LDFLAGS_SHARED=-shared
+endif
+
# targets
phony += all
all: $T
@@ -43,7 +50,7 @@
$(LUA) test.lua
$T: $(OBJS)
- $(CC) $(LDFLAGS) -o $@ -shared $(OBJS)
+ $(CC) $(LDFLAGS) -o $@ $(LDFLAGS_SHARED) $(OBJS)
$(OBJS): modemuncher.c

16
contrib/luaposix/patches/200-crypt.patch
View file

@ -1,8 +1,6 @@
Index: luaposix-5.1.2/lposix.c --- a/lposix.c
=================================================================== +++ b/lposix.c
--- luaposix-5.1.2.orig/lposix.c 2008-06-02 17:35:21.000000000 +0200 @@ -1016,6 +1016,29 @@
+++ luaposix-5.1.2/lposix.c 2008-06-02 17:35:26.000000000 +0200
@@ -1006,6 +1006,29 @@
} }
#endif #endif
@ -32,7 +30,7 @@ Index: luaposix-5.1.2/lposix.c
static const luaL_reg R[] = static const luaL_reg R[] =
{ {
{"access", Paccess}, {"access", Paccess},
@@ -1013,6 +1036,7 @@ @@ -1023,6 +1046,7 @@
{"chdir", Pchdir}, {"chdir", Pchdir},
{"chmod", Pchmod}, {"chmod", Pchmod},
{"chown", Pchown}, {"chown", Pchown},
@ -40,10 +38,8 @@ Index: luaposix-5.1.2/lposix.c
{"ctermid", Pctermid}, {"ctermid", Pctermid},
{"dirname", Pdirname}, {"dirname", Pdirname},
{"dir", Pdir}, {"dir", Pdir},
Index: luaposix-5.1.2/Makefile --- a/Makefile
=================================================================== +++ b/Makefile
--- luaposix-5.1.2.orig/Makefile 2008-06-02 17:35:26.000000000 +0200
+++ luaposix-5.1.2/Makefile 2008-06-02 17:35:18.000000000 +0200
@@ -37,8 +37,10 @@ @@ -37,8 +37,10 @@
OS=$(shell uname) OS=$(shell uname)
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)