| 1 |
mabi 09/04/05 23:23:41 |
| 2 |
|
| 3 |
Modified: lua-5.1-make-r1.patch lua-5.1-make_static-r1.patch |
| 4 |
Log: |
| 5 |
fix broken patches, cleanup |
| 6 |
(Portage version: 2.1.6.11/cvs/Linux ppc) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-lang/lua/files/lua-5.1-make-r1.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/lua/files/lua-5.1-make-r1.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/lua/files/lua-5.1-make-r1.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/lua/files/lua-5.1-make-r1.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: lua-5.1-make-r1.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/lua/files/lua-5.1-make-r1.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- lua-5.1-make-r1.patch 22 Mar 2009 09:46:48 -0000 1.1 |
| 22 |
+++ lua-5.1-make-r1.patch 5 Apr 2009 23:23:41 -0000 1.2 |
| 23 |
@@ -24,6 +24,12 @@ |
| 24 |
+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB) |
| 25 |
--- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100 |
| 26 |
+++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100 |
| 27 |
+@@ -54,1 +54,1 @@ |
| 28 |
+-$(LUA_T): $(LUA_O) $(LUA_A) |
| 29 |
++origin$(LUA_T): $(LUA_O) $(LUA_A) |
| 30 |
+@@ -57,1 +57,1 @@ |
| 31 |
+-$(LUAC_T): $(LUAC_O) $(LUA_A) |
| 32 |
++origin$(LUAC_T): $(LUAC_O) $(LUA_A) |
| 33 |
@@ -176,3 +176,33 @@ |
| 34 |
ltm.h lzio.h lmem.h lopcodes.h lundump.h |
| 35 |
|
| 36 |
@@ -46,7 +52,7 @@ |
| 37 |
+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) |
| 38 |
+ |
| 39 |
+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME) |
| 40 |
-+ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O::.o=.lo) $(LUA_LIBS) -llua |
| 41 |
++ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) |
| 42 |
+ |
| 43 |
+lua_test: $(LUA_O:.o=.lo) $(LIB_NAME) |
| 44 |
+ $(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) |
| 45 |
@@ -57,4 +63,4 @@ |
| 46 |
+gentoo_clean: |
| 47 |
+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac |
| 48 |
+ |
| 49 |
-+gentoo_all: $(LIB_NAME) $(LIB_NAME:.la=.a) $(LUA_T) lua_test $(LUAC_T) |
| 50 |
++gentoo_all: $(LIB_NAME) $(LUA_T) lua_test $(LUAC_T) |
| 51 |
|
| 52 |
|
| 53 |
|
| 54 |
1.2 dev-lang/lua/files/lua-5.1-make_static-r1.patch |
| 55 |
|
| 56 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/lua/files/lua-5.1-make_static-r1.patch?rev=1.2&view=markup |
| 57 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/lua/files/lua-5.1-make_static-r1.patch?rev=1.2&content-type=text/plain |
| 58 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/lua/files/lua-5.1-make_static-r1.patch?r1=1.1&r2=1.2 |
| 59 |
|
| 60 |
Index: lua-5.1-make_static-r1.patch |
| 61 |
=================================================================== |
| 62 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/lua/files/lua-5.1-make_static-r1.patch,v |
| 63 |
retrieving revision 1.1 |
| 64 |
retrieving revision 1.2 |
| 65 |
diff -u -r1.1 -r1.2 |
| 66 |
--- lua-5.1-make_static-r1.patch 22 Mar 2009 09:46:48 -0000 1.1 |
| 67 |
+++ lua-5.1-make_static-r1.patch 5 Apr 2009 23:23:41 -0000 1.2 |
| 68 |
@@ -2,11 +2,11 @@ |
| 69 |
--- lua-5.1.1.orig/src/Makefile 2006-11-21 07:19:31 +0000 |
| 70 |
+++ lua-5.1.1/src/Makefile 2006-11-21 07:19:52 +0000 |
| 71 |
@@ -196,7 +196,7 @@ |
| 72 |
- -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) |
| 73 |
+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) |
| 74 |
|
| 75 |
- $(LUA_T): $(LUA_O) $(LIB_NAME) |
| 76 |
-- $(LIBTOOL) --mode=link $(CC) -export-dynamic -o $@ $(LUA_O:.o=.lo) $(LUA_LIBS) -llua |
| 77 |
-+ $(LIBTOOL) --mode=link $(CC) -static -export-dynamic -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) |
| 78 |
+ $(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME) |
| 79 |
+- $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LUA_LIBS) $(LUA_LIBS) |
| 80 |
++ $(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) |
| 81 |
|
| 82 |
$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME) |
| 83 |
$(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME) |
Archives