Author: igor Date: Sun Jul 21 05:52:51 2013 New Revision: 2670 Log: Lua: removed LUA_ROOT change from the shared library patch
Added: trunk/lua/lua-5.1.5-shared_library-2.patch trunk/lua/lua-5.2.2-shared_library-2.patch Added: trunk/lua/lua-5.1.5-shared_library-2.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/lua/lua-5.1.5-shared_library-2.patch Sun Jul 21 05:52:51 2013 (r2670) @@ -0,0 +1,60 @@ +Submitted By: Igor Živković <contact at igor hyphen zivkovic dot from dot hr> +Date: 2013-07-17 +Initial Package Version: 5.1.5 +Upstream Status: Rejected +Origin: Arch Linux packages repository +Description: Adds the compilation of a shared library. + +diff -Naur lua-5.1.5.orig/Makefile lua-5.1.5/Makefile +--- lua-5.1.5.orig/Makefile 2012-02-10 10:50:23.000000000 +0100 ++++ lua-5.1.5/Makefile 2013-07-17 18:57:36.498528022 +0200 +@@ -53,7 +53,7 @@ + all: $(PLAT) + + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R) + + test: dummy + src/lua test/hello.lua +diff -Naur lua-5.1.5.orig/src/Makefile lua-5.1.5/src/Makefile +--- lua-5.1.5.orig/src/Makefile 2012-02-13 21:41:22.000000000 +0100 ++++ lua-5.1.5/src/Makefile 2013-07-17 19:00:46.142921587 +0200 +@@ -8,7 +8,7 @@ + PLAT= none + + CC= gcc +-CFLAGS= -O2 -Wall $(MYCFLAGS) ++CFLAGS= -fPIC -O2 -Wall $(MYCFLAGS) + AR= ar rcu + RANLIB= ranlib + RM= rm -f +@@ -23,6 +23,7 @@ + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.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 +@@ -36,7 +37,7 @@ + LUAC_O= luac.o print.o + + ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + default: $(PLAT) +@@ -51,6 +52,11 @@ + $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + Added: trunk/lua/lua-5.2.2-shared_library-2.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/lua/lua-5.2.2-shared_library-2.patch Sun Jul 21 05:52:51 2013 (r2670) @@ -0,0 +1,61 @@ +Submitted By: Igor Živković <contact at igor hyphen zivkovic dot from dot hr> +Date: 2013-06-19 +Initial Package Version: 5.2.2 +Upstream Status: Rejected +Origin: Arch Linux packages repository +Description: Adds the compilation of a shared library. + +diff -Naur lua-5.2.2.orig/Makefile lua-5.2.2/Makefile +--- lua-5.2.2.orig/Makefile 2012-05-17 16:05:54.000000000 +0200 ++++ lua-5.2.2/Makefile 2013-06-19 20:04:12.338167412 +0200 +@@ -52,7 +52,7 @@ + all: $(PLAT) + + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R) + + test: dummy + src/lua -v +diff -Naur lua-5.2.2.orig/src/Makefile lua-5.2.2/src/Makefile +--- lua-5.2.2.orig/src/Makefile 2012-12-27 11:51:43.000000000 +0100 ++++ lua-5.2.2/src/Makefile 2013-06-19 20:04:40.924213226 +0200 +@@ -7,7 +7,7 @@ + PLAT= none + + CC= gcc +-CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) ++CFLAGS= -fPIC -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) + LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) + LIBS= -lm $(SYSLIBS) $(MYLIBS) + +@@ -29,6 +29,7 @@ + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + 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 +@@ -43,7 +44,7 @@ + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -59,6 +60,12 @@ + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
