[patch] patch for files used in lua-5.1.4-r1.ebuild

lua-5.1.4-r1.libtool.patch (text/plain), 3.17 KB, created by Michael Haubenwallner (RETIRED) on 2009-03-26 13:13:32 UTC

Index: files/lua-5.1-make-r1.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/lua/files/lua-5.1-make-r1.patch,v
retrieving revision 1.1
diff -u -r1.1 lua-5.1-make-r1.patch
--- files/lua-5.1-make-r1.patch	22 Mar 2009 09:46:48 -0000	1.1
+++ files/lua-5.1-make-r1.patch	26 Mar 2009 12:58:29 -0000
@@ -24,6 +24,12 @@
 +	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.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
+@@ -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)
 @@ -176,3 +176,33 @@
    ltm.h lzio.h lmem.h lopcodes.h lundump.h
  
@@ -46,7 +52,7 @@
 +            -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) $(LUA_LIBS) -llua
++	$(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)
@@ -57,4 +63,4 @@
 +gentoo_clean:
 +	$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac
 +
-+gentoo_all: $(LIB_NAME) $(LIB_NAME:.la=.a) $(LUA_T) lua_test $(LUAC_T)
++gentoo_all: $(LIB_NAME) $(LUA_T) lua_test $(LUAC_T)
Index: files/lua-5.1-make_static-r1.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/lua/files/lua-5.1-make_static-r1.patch,v
retrieving revision 1.1
diff -u -r1.1 lua-5.1-make_static-r1.patch
--- files/lua-5.1-make_static-r1.patch	22 Mar 2009 09:46:48 -0000	1.1
+++ files/lua-5.1-make_static-r1.patch	26 Mar 2009 12:58:29 -0000
@@ -1,12 +1,11 @@
-diff -ru lua-5.1.1.orig/src/Makefile lua-5.1.1/src/Makefile
---- lua-5.1.1.orig/src/Makefile	2006-11-21 07:19:31 +0000
-+++ lua-5.1.1/src/Makefile	2006-11-21 07:19:52 +0000
-@@ -196,7 +196,7 @@
-             -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
+--- lua-5.1.4/src/Makefile.orig	2009-03-26 13:43:02.000000000 +0100
++++ lua-5.1.4/src/Makefile	2009-03-26 13:43:20.000000000 +0100
+@@ -198,7 +198,7 @@
+             -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
  
- $(LUA_T): $(LUA_O) $(LIB_NAME)
--	$(LIBTOOL) --mode=link $(CC) -export-dynamic -o $@ $(LUA_O:.o=.lo) $(LUA_LIBS) -llua
-+	$(LIBTOOL) --mode=link $(CC) -static -export-dynamic -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_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)
++	$(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 -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
+ 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)