diff options
-rw-r--r-- | lang/lua52/Makefile | 4 | ||||
-rw-r--r-- | lang/lua52/distinfo | 5 | ||||
-rw-r--r-- | lang/lua52/patches/patch-ab | 4 | ||||
-rw-r--r-- | lang/lua52/patches/patch-src_lua.c | 14 |
4 files changed, 22 insertions, 5 deletions
diff --git a/lang/lua52/Makefile b/lang/lua52/Makefile index d53cede928a..4c949b4537b 100644 --- a/lang/lua52/Makefile +++ b/lang/lua52/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/10/09 14:06:38 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2015/03/05 13:39:20 ryoon Exp $ DISTNAME= lua-${LUA_VERSION} PKGNAME= lua52-${LUA_VERSION} @@ -31,6 +31,8 @@ INSTALLATION_DIRS+= lib/pkgconfig share/doc/lua-5.2 BUILD_TARGET= freebsd .elif !empty(OPSYS:M*BSD*) || ${OPSYS} == "DragonFly" BUILD_TARGET= bsd +.elif ${OPSYS} == "Cygwin" +BUILD_TARGET= bsd .elif ${OPSYS} == "Linux" BUILD_TARGET= linux .elif ${OPSYS} == "Darwin" diff --git a/lang/lua52/distinfo b/lang/lua52/distinfo index fd17e2667a1..4b97f3d4965 100644 --- a/lang/lua52/distinfo +++ b/lang/lua52/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.4 2015/01/02 15:50:43 alnsn Exp $ +$NetBSD: distinfo,v 1.5 2015/03/05 13:39:20 ryoon Exp $ SHA1 (lua-5.2.3.tar.gz) = 926b7907bc8d274e063d42804666b40a3f3c124c RMD160 (lua-5.2.3.tar.gz) = b8714669c8c0f8272104effd8a9675921ddb2fa5 Size (lua-5.2.3.tar.gz) = 251195 bytes SHA1 (patch-aa) = ce0763ed1515f670b8a5d543af3753320cf06309 -SHA1 (patch-ab) = 92f711427090021d89b8fcb1d3633ca6300c830d +SHA1 (patch-ab) = 498dac3f444ccf6f6dff22c4644b8123865f3a9d SHA1 (patch-ac) = b8b9c0068210795e5eb22512767ac2e98bca8cbc SHA1 (patch-src_liolib.c) = e85afa1ab7060be2c027ecd619fd9c9fd721a8b5 +SHA1 (patch-src_lua.c) = 393ef8161b28e201abd5b27d7c4c92b19de4601e diff --git a/lang/lua52/patches/patch-ab b/lang/lua52/patches/patch-ab index 02750b89b07..39c366319c1 100644 --- a/lang/lua52/patches/patch-ab +++ b/lang/lua52/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2014/05/03 13:00:45 alnsn Exp $ +$NetBSD: patch-ab,v 1.3 2015/03/05 13:39:20 ryoon Exp $ --- src/Makefile.orig 2013-11-11 11:45:49.000000000 +0000 +++ src/Makefile @@ -53,7 +53,7 @@ $NetBSD: patch-ab,v 1.2 2014/05/03 13:00:45 alnsn Exp $ $(LUA_A): $(BASE_O) - $(AR) $@ $(BASE_O) - $(RANLIB) $@ -+ ${LIBTOOL} --tag=CC --mode=link $(CC) $(LDFLAGS) -o $@ $(BASE_O) -rpath ${PREFIX}/lib -version-info ${LV} ${LIBS} ++ ${LIBTOOL} --tag=CC --mode=link $(CC) -no-undefined $(LDFLAGS) -o $@ $(BASE_O) -rpath ${PREFIX}/lib -version-info ${LV} ${LIBS} $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) diff --git a/lang/lua52/patches/patch-src_lua.c b/lang/lua52/patches/patch-src_lua.c new file mode 100644 index 00000000000..0f5178f694f --- /dev/null +++ b/lang/lua52/patches/patch-src_lua.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_lua.c,v 1.1 2015/03/05 13:39:20 ryoon Exp $ + +--- src/lua.c.orig 2013-04-12 18:48:47.000000000 +0000 ++++ src/lua.c +@@ -453,7 +453,9 @@ static int pmain (lua_State *L) { + lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV"); + } + /* open standard libraries */ ++#if !defined(__CYGWIN__) + luaL_checkversion(L); ++#endif + lua_gc(L, LUA_GCSTOP, 0); /* stop collector during initialization */ + luaL_openlibs(L); /* open libraries */ + lua_gc(L, LUA_GCRESTART, 0); |