mabi 14/04/22 21:30:44 Added: lua-5.1-make-r2.patch lua-5.2-make-r1.patch Log: Introduce slotted versions of lua. Use with eselect to define the "main" version. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xDDF971F118EEA5E6!)
Revision Changes Path 1.1 dev-lang/lua/files/lua-5.1-make-r2.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/files/lua-5.1-make-r2.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/files/lua-5.1-make-r2.patch?rev=1.1&content-type=text/plain Index: lua-5.1-make-r2.patch =================================================================== diff -ru lua-5.1.5.orig/Makefile lua-5.1.5/Makefile --- lua-5.1.5.orig/Makefile 2014-04-15 17:43:34.845435031 +0200 +++ lua-5.1.5/Makefile 2014-04-15 19:05:08.669304987 +0200 @@ -11,7 +11,7 @@ # so take care if INSTALL_TOP is not an absolute path. INSTALL_TOP= /usr/local INSTALL_BIN= $(INSTALL_TOP)/bin -INSTALL_INC= $(INSTALL_TOP)/include +INSTALL_INC= $(INSTALL_TOP)/include/lua$V INSTALL_LIB= $(INSTALL_TOP)/lib INSTALL_MAN= $(INSTALL_TOP)/man/man1 # @@ -126,3 +126,21 @@ .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho # (end of Makefile) + +# Use libtool for binary installs, etc. + +export V +export LIBTOOL = libtool --quiet --tag=CC +# See libtool manual about how to set this + +gentoo_clean: + cd src; $(MAKE) $@ + +gentoo_test: gentoo_linux + test/lua.static test/hello.lua + +gentoo_install: + mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) + cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN) + cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB) diff -ru lua-5.1.5.orig/src/Makefile lua-5.1.5/src/Makefile --- lua-5.1.5.orig/src/Makefile 2014-04-15 17:43:34.844435031 +0200 +++ lua-5.1.5/src/Makefile 2014-04-15 18:07:21.427397122 +0200 @@ -29,10 +29,10 @@ LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ lstrlib.o loadlib.o linit.o -LUA_T= lua +LUA_T= lua$V LUA_O= lua.o -LUAC_T= luac +LUAC_T= luac$V LUAC_O= luac.o print.o ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) @@ -51,10 +51,10 @@ $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files $(RANLIB) $@ -$(LUA_T): $(LUA_O) $(LUA_A) +origin$(LUA_T): $(LUA_O) $(LUA_A) $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) -$(LUAC_T): $(LUAC_O) $(LUA_A) +origin$(LUAC_T): $(LUAC_O) $(LUA_A) $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) clean: @@ -180,3 +180,33 @@ ltm.h lzio.h lmem.h lopcodes.h lundump.h # (end of Makefile) + +export LIBTOOL = libtool --tag=CC +export LIB_VERSION = 5:1:5 + +# The following rules use libtool for compiling and linking in order to +# provide shared library support. + +LIB_NAME = liblua$V.la +LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) + +%.lo %.o: %.c + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< + +$(LIB_NAME): $(LIB_OBJS) + $(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \ + -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) + +$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME) + $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) + +lua_test: $(LUA_O:.o=.lo) $(LIB_NAME) + $(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) + +$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME) + $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME) + +gentoo_clean: + $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V + +gentoo_all: $(LIB_NAME) $(LUA_T) lua_test $(LUAC_T) 1.1 dev-lang/lua/files/lua-5.2-make-r1.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/files/lua-5.2-make-r1.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/files/lua-5.2-make-r1.patch?rev=1.1&content-type=text/plain Index: lua-5.2-make-r1.patch =================================================================== --- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200 +++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100 @@ -11,7 +11,7 @@ # so take care if INSTALL_TOP is not an absolute path. INSTALL_TOP= /usr/local INSTALL_BIN= $(INSTALL_TOP)/bin -INSTALL_INC= $(INSTALL_TOP)/include +INSTALL_INC= $(INSTALL_TOP)/include/lua$V INSTALL_LIB= $(INSTALL_TOP)/lib INSTALL_MAN= $(INSTALL_TOP)/man/man1 # @@ -127,3 +127,18 @@ .PHONY: all $(PLATS) clean install local none dummy echo pecho lecho newer # (end of Makefile) + +# Use libtool for binary installs, etc. + +export V +export LIBTOOL = $(EROOT)usr/bin/libtool --quiet --tag=CC +# See libtool manual about how to set this + +gentoo_clean: + cd src; $(MAKE) $@ + +gentoo_install: + mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) + cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN) + cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB) --- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100 +++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100 @@ -39,1 +39,1 @@ -LUA_T= lua +LUA_T= lua$V @@ -42,1 +42,1 @@ -LUAC_T= luac +LUAC_T= luac$V @@ -54,1 +54,1 @@ -$(LUA_T): $(LUA_O) $(LUA_A) +origin$(LUA_T): $(LUA_O) $(LUA_A) @@ -57,1 +57,1 @@ -$(LUAC_T): $(LUAC_O) $(LUA_A) +origin$(LUAC_T): $(LUAC_O) $(LUA_A) @@ -185,3 +185,30 @@ lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \ lzio.h + +export LIBTOOL = $(EROOT)usr/bin/libtool --quiet --tag=CC +export LIB_VERSION = 6:1:1 + +# The following rules use libtool for compiling and linking in order to +# provide shared library support. + +LIB_NAME = liblua$V.la +LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) + +%.lo %.o: %.c + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< + +$(LIB_NAME): $(LIB_OBJS) + $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \ + -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) + +$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME) + $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) + +$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME) + $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME) + +gentoo_clean: + $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V + +gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
