diff options
author | 2009-04-05 23:23:41 +0000 | |
---|---|---|
committer | 2009-04-05 23:23:41 +0000 | |
commit | 3cf2b41b797dc8acabbc819794a884069291d860 (patch) | |
tree | 7beb99fa01a9a356ba836b8b71edfeded80ee2b5 /dev-lang/lua/files | |
parent | Version bump (diff) | |
download | historical-3cf2b41b797dc8acabbc819794a884069291d860.tar.gz historical-3cf2b41b797dc8acabbc819794a884069291d860.tar.bz2 historical-3cf2b41b797dc8acabbc819794a884069291d860.zip |
fix broken patches, cleanup
Package-Manager: portage-2.1.6.11/cvs/Linux ppc
Diffstat (limited to 'dev-lang/lua/files')
-rw-r--r-- | dev-lang/lua/files/lua-5.1-make-r1.patch | 10 | ||||
-rw-r--r-- | dev-lang/lua/files/lua-5.1-make_static-r1.patch | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/dev-lang/lua/files/lua-5.1-make-r1.patch b/dev-lang/lua/files/lua-5.1-make-r1.patch index b50620099564..8eecbdd40268 100644 --- a/dev-lang/lua/files/lua-5.1-make-r1.patch +++ b/dev-lang/lua/files/lua-5.1-make-r1.patch @@ -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) diff --git a/dev-lang/lua/files/lua-5.1-make_static-r1.patch b/dev-lang/lua/files/lua-5.1-make_static-r1.patch index 2d3d1d31d6c4..a82e1c3baac5 100644 --- a/dev-lang/lua/files/lua-5.1-make_static-r1.patch +++ b/dev-lang/lua/files/lua-5.1-make_static-r1.patch @@ -2,11 +2,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) + -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) $(LUA_LIBS) $(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) |