| 1 |
mabi 09/03/22 09:46:48 |
| 2 |
|
| 3 |
Added: lua-5.1-make-r1.patch lua-5.1-make_static-r1.patch |
| 4 |
Log: |
| 5 |
fix bug #260008 (new makefile!) |
| 6 |
(Portage version: 2.1.6.9/cvs/Linux ppc) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 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.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/lua/files/lua-5.1-make-r1.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: lua-5.1-make-r1.patch |
| 15 |
=================================================================== |
| 16 |
--- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200 |
| 17 |
+++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100 |
| 18 |
@@ -127,3 +127,21 @@ |
| 19 |
.PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho newer |
| 20 |
|
| 21 |
# (end of Makefile) |
| 22 |
+ |
| 23 |
+# Use libtool for binary installs, etc. |
| 24 |
+ |
| 25 |
+export V |
| 26 |
+export LIBTOOL = libtool --quiet --tag=CC |
| 27 |
+# See libtool manual about how to set this |
| 28 |
+ |
| 29 |
+gentoo_clean: |
| 30 |
+ cd src; $(MAKE) $@ |
| 31 |
+ |
| 32 |
+gentoo_test: gentoo_linux |
| 33 |
+ test/lua.static test/hello.lua |
| 34 |
+ |
| 35 |
+gentoo_install: |
| 36 |
+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) |
| 37 |
+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac $(INSTALL_BIN) |
| 38 |
+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) |
| 39 |
+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB) |
| 40 |
--- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100 |
| 41 |
+++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100 |
| 42 |
@@ -176,3 +176,33 @@ |
| 43 |
ltm.h lzio.h lmem.h lopcodes.h lundump.h |
| 44 |
|
| 45 |
# (end of Makefile) |
| 46 |
+ |
| 47 |
+export LIBTOOL = libtool --quiet --tag=CC |
| 48 |
+export LIB_VERSION = 6:1:1 |
| 49 |
+ |
| 50 |
+# The following rules use libtool for compiling and linking in order to |
| 51 |
+# provide shared library support. |
| 52 |
+ |
| 53 |
+LIB_NAME = liblua.la |
| 54 |
+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) |
| 55 |
+ |
| 56 |
+%.lo %.o: %.c |
| 57 |
+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< |
| 58 |
+ |
| 59 |
+$(LIB_NAME): $(LIB_OBJS) |
| 60 |
+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \ |
| 61 |
+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) |
| 62 |
+ |
| 63 |
+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME) |
| 64 |
+ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O::.o=.lo) $(LUA_LIBS) -llua |
| 65 |
+ |
| 66 |
+lua_test: $(LUA_O:.o=.lo) $(LIB_NAME) |
| 67 |
+ $(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) |
| 68 |
+ |
| 69 |
+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME) |
| 70 |
+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME) |
| 71 |
+ |
| 72 |
+gentoo_clean: |
| 73 |
+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac |
| 74 |
+ |
| 75 |
+gentoo_all: $(LIB_NAME) $(LIB_NAME:.la=.a) $(LUA_T) lua_test $(LUAC_T) |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
1.1 dev-lang/lua/files/lua-5.1-make_static-r1.patch |
| 80 |
|
| 81 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/lua/files/lua-5.1-make_static-r1.patch?rev=1.1&view=markup |
| 82 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/lua/files/lua-5.1-make_static-r1.patch?rev=1.1&content-type=text/plain |
| 83 |
|
| 84 |
Index: lua-5.1-make_static-r1.patch |
| 85 |
=================================================================== |
| 86 |
diff -ru lua-5.1.1.orig/src/Makefile lua-5.1.1/src/Makefile |
| 87 |
--- lua-5.1.1.orig/src/Makefile 2006-11-21 07:19:31 +0000 |
| 88 |
+++ lua-5.1.1/src/Makefile 2006-11-21 07:19:52 +0000 |
| 89 |
@@ -196,7 +196,7 @@ |
| 90 |
-rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) |
| 91 |
|
| 92 |
$(LUA_T): $(LUA_O) $(LIB_NAME) |
| 93 |
- $(LIBTOOL) --mode=link $(CC) -export-dynamic -o $@ $(LUA_O:.o=.lo) $(LUA_LIBS) -llua |
| 94 |
+ $(LIBTOOL) --mode=link $(CC) -static -export-dynamic -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) |
| 95 |
|
| 96 |
$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME) |
| 97 |
$(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME) |
Archives