diff options
| author | alnsn <alnsn@pkgsrc.org> | 2014-05-03 13:00:44 +0000 |
|---|---|---|
| committer | alnsn <alnsn@pkgsrc.org> | 2014-05-03 13:00:44 +0000 |
| commit | 5518944c52c286f0875d4454c1a3481e648b5e41 (patch) | |
| tree | c339de9879e29da7d839e2bc71a8658a92217e0b /lang/lua52/patches | |
| parent | 9ba2e769108b296d5c7ef0ded1233535cac28f7c (diff) | |
| download | pkgsrc-5518944c52c286f0875d4454c1a3481e648b5e41.tar.gz | |
Multiversion support for Lua.
Diffstat (limited to 'lang/lua52/patches')
| -rw-r--r-- | lang/lua52/patches/patch-aa | 20 | ||||
| -rw-r--r-- | lang/lua52/patches/patch-ab | 12 |
2 files changed, 20 insertions, 12 deletions
diff --git a/lang/lua52/patches/patch-aa b/lang/lua52/patches/patch-aa index 66315e4a442..c4e982656ff 100644 --- a/lang/lua52/patches/patch-aa +++ b/lang/lua52/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1 2013/10/30 06:18:10 dholland Exp $ +$NetBSD: patch-aa,v 1.2 2014/05/03 13:00:45 alnsn Exp $ ---- Makefile.orig 2012-05-17 14:05:54.000000000 +0000 +--- Makefile.orig 2013-11-10 00:49:35.000000000 +0000 +++ Makefile @@ -10,11 +10,11 @@ PLAT= none # so take care if INSTALL_TOP is not an absolute path. See the local target. @@ -9,7 +9,8 @@ $NetBSD: patch-aa,v 1.1 2013/10/30 06:18:10 dholland Exp $ -INSTALL_TOP= /usr/local +INSTALL_TOP= ${PREFIX} INSTALL_BIN= $(INSTALL_TOP)/bin - INSTALL_INC= $(INSTALL_TOP)/include +-INSTALL_INC= $(INSTALL_TOP)/include ++INSTALL_INC= $(INSTALL_TOP)/include/lua-5.2 INSTALL_LIB= $(INSTALL_TOP)/lib -INSTALL_MAN= $(INSTALL_TOP)/man/man1 +INSTALL_MAN= $(INSTALL_TOP)/${PKGMANDIR}/man1 @@ -25,15 +26,20 @@ $NetBSD: patch-aa,v 1.1 2013/10/30 06:18:10 dholland Exp $ # # If you don't have "install" you can use "cp" instead. # INSTALL= cp -p -@@ -41,7 +41,7 @@ PLATS= aix ansi bsd freebsd generic linu +@@ -39,10 +39,10 @@ RM= rm -f + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + # What to install. - TO_BIN= lua luac +-TO_BIN= lua luac ++TO_BIN= lua5.2 luac5.2 TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp -TO_LIB= liblua.a -+TO_LIB= liblua.la - TO_MAN= lua.1 luac.1 +-TO_MAN= lua.1 luac.1 ++TO_LIB= liblua5.2.la ++TO_MAN= lua5.2.1 luac5.2.1 # Lua version and release. + V= 5.2 @@ -58,11 +58,11 @@ test: dummy src/lua -v diff --git a/lang/lua52/patches/patch-ab b/lang/lua52/patches/patch-ab index f07b7a55f87..02750b89b07 100644 --- a/lang/lua52/patches/patch-ab +++ b/lang/lua52/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.1 2013/10/30 06:18:10 dholland Exp $ +$NetBSD: patch-ab,v 1.2 2014/05/03 13:00:45 alnsn Exp $ ---- src/Makefile.orig 2012-12-27 10:51:43.000000000 +0000 +--- src/Makefile.orig 2013-11-11 11:45:49.000000000 +0000 +++ src/Makefile @@ -6,8 +6,7 @@ # Your platform. See PLATS for possible values. @@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.1 2013/10/30 06:18:10 dholland Exp $ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris -LUA_A= liblua.a -+LUA_A= liblua.la ++LUA_A= liblua5.2.la CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ ltm.o lundump.o lvm.o lzio.o @@ -35,12 +35,14 @@ $NetBSD: patch-ab,v 1.1 2013/10/30 06:18:10 dholland Exp $ -BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) +BASE_O= $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) $(MYOBJS:.o=.lo) - LUA_T= lua +-LUA_T= lua -LUA_O= lua.o ++LUA_T= lua5.2 +LUA_O= lua.lo - LUAC_T= luac +-LUAC_T= luac -LUAC_O= luac.o ++LUAC_T= luac5.2 +LUAC_O= luac.lo ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) |