summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-lang/lua/ChangeLog6
-rw-r--r--dev-lang/lua/files/lua-5.1-make_static.patch4
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 3a90fc15b0c0..fa16ba55d04f 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/lua
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.127 2009/03/30 16:46:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.128 2009/04/04 08:58:48 mabi Exp $
+
+ 04 Apr 2009; Matti Bickel <mabi@gentoo.org>
+ files/lua-5.1-make_static.patch:
+ fixed missing $(LDFLAGS) that was added to make.patch but not make_static.patch
30 Mar 2009; Raúl Porcel <armin76@gentoo.org> lua-5.1.4.ebuild:
arm/ia64/s390/sh/sparc/x86 stable wrt #255191
diff --git a/dev-lang/lua/files/lua-5.1-make_static.patch b/dev-lang/lua/files/lua-5.1-make_static.patch
index 502109d1708d..f0125686c2b1 100644
--- a/dev-lang/lua/files/lua-5.1-make_static.patch
+++ b/dev-lang/lua/files/lua-5.1-make_static.patch
@@ -5,8 +5,8 @@ diff -ru lua-5.1.1.orig/src/Makefile lua-5.1.1/src/Makefile
-rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
$(LUA_T): $(LUA_O) $(LIB_NAME)
-- $(LIBTOOL) --mode=link $(CC) -Wl,-E -o $@ $(LUA_O) $(LUA_LIBS) -llua
-+ $(LIBTOOL) --mode=link $(CC) -static -Wl,-E -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS)
+- $(LIBTOOL) --mode=link $(CC) -Wl,-E $(LDFLAGS) -o $@ $(LUA_O) $(LUA_LIBS) -llua
++ $(LIBTOOL) --mode=link $(CC) -static -Wl,-E $(LDFLAGS) -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS)
$(LUAC_T): $(LUAC_O) $(LIB_NAME)
$(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O) $(LIB_NAME)