fixed missing $(LDFLAGS) that was added to make.patch but not make_static.patch

Package-Manager: portage-2.1.6.11/cvs/Linux ppc

3 files changed, 19 insertions, 5 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/Manifest b/dev-lang/lua/Manifest
index 17101b960394..63aa570e6070 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 5.1.3/01_all_LUAI_MAXCSTACK.upstream.patch 685 RMD160 5e82432ff598210a1c3bbda5d60c46622fe4254c SHA1 7c40bb5f0aa73f93d4e58ec061fd9b41df63b6f9 SHA256 e99f4e7c481d4ab3b6773f7255e55da3fb6e37f0da51f00db93dd0cd8d10e47a
 AUX 5.1.3/02_all_coroutine.resume.upstream.patch 531 RMD160 1acef8e4257bf1cb96844fc210d3cd9ffab03fd6 SHA1 f70429a1b517c3f9b132b428abacf51a2a02d9e4 SHA256 ede1d6684c29b5710881def9c4edb429434321085c0478db7a1e5faaf4054c5c
 AUX 5.1.3/03_all_lua_checkstack.upstream.patch 668 RMD160 b22b556f656cdd20743821d59f73b0e0f2f42167 SHA1 a13e42918f25f3c595a41a1eac6716e943fad00c SHA256 89c8aa6e4e65f1c7dfd2be7992ce9d6df27ead7dc661bddf94d3049b8bf714df
@@ -13,7 +16,7 @@ AUX 5.1.3/12_all_svalue.upstream.patch 303 RMD160 383d68a00fc2d3f451def70f4629df
 AUX lua-5.1-make-r1.patch 2075 RMD160 57f56d3cc4c2e4a514b4bef7e2c504362cf809e2 SHA1 ace3ffa41519da4739c54a10087f9658d6e2b3b1 SHA256 5876fedbb330133f1b5acc207c64bfad8939d91edf817831a6dd6313e9a19313
 AUX lua-5.1-make.patch 2209 RMD160 03d6ff5c31aa2ea8cb4dec871ae4ba4d711d2240 SHA1 103efb333cef67ab3f521e49bda56f647c633f7a SHA256 3ffa297c79ad7ba378eba3de2b730670e60c7ea28181fcca4e0d0e25612997c4
 AUX lua-5.1-make_static-r1.patch 598 RMD160 f5ca300b63dbb631a3af4f51195cca013f546b14 SHA1 cdba927578cfff3f29af24f80759d001e25bf949 SHA256 3db0dea9d8b5b7bb9cdce48e4068130b90d4920ce8337fc28249745849279059
-AUX lua-5.1-make_static.patch 552 RMD160 1ca1c74daee2845369f13a80773755301b1d5184 SHA1 2d49989dbfd730edafac1444fd09a824a8f649b5 SHA256 dac0400c15e5ad9b77ade7e981acde3c111b51e834427280e9fdcdbbcef05812
+AUX lua-5.1-make_static.patch 574 RMD160 6ea966acababd4f0f94f12e50b4ff0bc92e59235 SHA1 023133efea0bea0660c80dd4b811b1499b611e69 SHA256 6b62728ebf86a01d917a662aa265ba1bc9ccdb4599a36f1d2e15cfd06080bbd7
 AUX lua-5.1-module_paths.patch 1078 RMD160 31a3f13af427bdcae784e21a9456f9197c59379e SHA1 50cb1438b7c50536ebf712d16d153eac40599562 SHA256 1115b6aa00eb4e918156ae70c763534bd2f603ba888da75e4908c19c2ac3e5f7
 AUX lua-5.1-readline.patch 360 RMD160 29e6f8193592ec6e551e46f953563113a72d2de2 SHA1 25baabcb1d3449c3c38726fc7de6c4abb34667a6 SHA256 1f0f90eb8103e338f1188cc884c0c59cc6afd023828c11d86b8145b2a8d1efc2
 AUX lua-5.1.3-deprecated.patch 1417 RMD160 c2f51932850ca7deb6a0df41e4fe67764e48608c SHA1 f003694a532f6cb4bb629918d8c2db8c52696723 SHA256 8d4d3c35d9cfb65f6caa360c09d1fa0c5dc1ee0de3389c1e73602fef86cd0e9f
@@ -28,5 +31,12 @@ EBUILD lua-5.1.3-r3.ebuild 2967 RMD160 2853f527bc2f6ecd7ccf5b910ed045d5462d11f6
 EBUILD lua-5.1.3-r4.ebuild 3041 RMD160 6081734baf13ff575aa5fa9cabf8ecf98968938b SHA1 449192cef6d30eaf81b4a1e007d7da03a362f14b SHA256 da399b248158b060e937e48b32e1bd63404ad765dc2173fde87e133b5b98f768
 EBUILD lua-5.1.4-r1.ebuild 3012 RMD160 e1c82ed3d00d328d252d69e3f8cd2cf87be4deba SHA1 e7a456257f6d8da43cc9df3add3b7cf43558d9db SHA256 e8459fb17fa2dace1e7e06ee730638615e25f952bb7f106ac9605502df5596d5
 EBUILD lua-5.1.4.ebuild 2998 RMD160 3217788cd7945b9a6b4d6c608559a61fb6aeb9fd SHA1 29bc6c3bf74b76cef99ba0575d1aad2c39c7a241 SHA256 938147c46b737dd9a9c5d3f4a97706d742c2d5eb2f3760f131da1e55025405f4
-MISC ChangeLog 18876 RMD160 c02d974589a87856ca48c02d73c0afef9fb3f1fb SHA1 ab10a6d99c7d443856867a0c5342911ab8cd3f41 SHA256 0e3e9c7237719eee575c9c7a25bc8c38007b862014509ca7bdb5ea15c22fe206
+MISC ChangeLog 19037 RMD160 e7c935989ecb9ded14f5b8a25538964420cc6e2f SHA1 8b056f95b7bc9385948729fed7c5ec40a5d5c960 SHA256 c46e252537a8666d465916ca2fdcf90698138d51c53f88635071cc0fa125da56
 MISC metadata.xml 339 RMD160 0d536a77658ffb6d8bccff7183a5bf4722d0a82d SHA1 f5bd1085f69b6e9d81e42cd711a7846ccb267e31 SHA256 6b3bedf093395def984b71f7c74ce59742c5df6592ad50f1b96c8a2499f27c8b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAknXISEACgkQfNMcoUhJ7GxcewCeKwyFbknbouMycLomSi7fbW5/
+9YwAmwWwymK7Z8poJg977LXLTagHzz7U
+=Q5lT
+-----END PGP SIGNATURE-----
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)