Added static useflag

Package-Manager: portage-2.1.1-r2

5 files changed, 47 insertions, 19 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index c6e29ba212c2..193843876c56 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/lua
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.52 2006/11/18 10:55:05 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.53 2006/11/21 14:47:10 mabi Exp $
+
+  21 Nov 2006; Matti Bickel <mabi@gentoo.org> files/lua-5.1.1-make.patch,
+  +files/lua-5.1.1-make_static.patch, lua-5.1.1.ebuild:
+  Added static useflag to allow to be closer to upstreams recommendations
 
   18 Nov 2006; Christian Faulhammer <opfer@gentoo.org> lua-5.1.1.ebuild:
   keyworded ~x86, bug #155518
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 75fa4960250c..5b3dc618c871 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -33,10 +33,14 @@ AUX lua-5.0.3-shared.patch 1360 RMD160 2f98bb90e4100bd7673d0f52a3720c9181bde987
 MD5 17d4d55107af46b9d72581c953f5a06e files/lua-5.0.3-shared.patch 1360
 RMD160 2f98bb90e4100bd7673d0f52a3720c9181bde987 files/lua-5.0.3-shared.patch 1360
 SHA256 c9ba1d3258ded3da1ca48210faf67b699ee80b115fec5fb4e9319cf7755dfc55 files/lua-5.0.3-shared.patch 1360
-AUX lua-5.1.1-make.patch 2475 RMD160 d4434c1b572d1190b83d653672df83448aa88932 SHA1 50f39b83338c1821dff7f042262823cc90220b2a SHA256 c7fa34b1529813b15f17ddd1398206091c4da2dba36223fb800bcf8302d6da80
-MD5 f915281e4d8ee50234752fa0c54a22d0 files/lua-5.1.1-make.patch 2475
-RMD160 d4434c1b572d1190b83d653672df83448aa88932 files/lua-5.1.1-make.patch 2475
-SHA256 c7fa34b1529813b15f17ddd1398206091c4da2dba36223fb800bcf8302d6da80 files/lua-5.1.1-make.patch 2475
+AUX lua-5.1.1-make.patch 2461 RMD160 864b3d5c8aa9b5e4ac67b2a8aa4d34aa8fddf0b0 SHA1 fc147bf665432dd9cb74c5b2f614029a70122ee7 SHA256 63ce1a6768a24aa4e26e17f82b9b138c82dfe62f4c65b23959c0c772b4fdc321
+MD5 1063c6f0dd742108d650d012af0981f6 files/lua-5.1.1-make.patch 2461
+RMD160 864b3d5c8aa9b5e4ac67b2a8aa4d34aa8fddf0b0 files/lua-5.1.1-make.patch 2461
+SHA256 63ce1a6768a24aa4e26e17f82b9b138c82dfe62f4c65b23959c0c772b4fdc321 files/lua-5.1.1-make.patch 2461
+AUX lua-5.1.1-make_static.patch 552 RMD160 a3af57618ead99633d51572eaa32c08087c058a2 SHA1 19fe146d1bbe0d93e5e7c0bffbdd463ecef39c7a SHA256 77b3b333911d414b00d77cbe1a16669687adb08440e35227f8be7e633adbe52d
+MD5 b258d732dce835c7287356c9a83f678a files/lua-5.1.1-make_static.patch 552
+RMD160 a3af57618ead99633d51572eaa32c08087c058a2 files/lua-5.1.1-make_static.patch 552
+SHA256 77b3b333911d414b00d77cbe1a16669687adb08440e35227f8be7e633adbe52d files/lua-5.1.1-make_static.patch 552
 AUX lua-5.1.1-module_paths.patch 1078 RMD160 31a3f13af427bdcae784e21a9456f9197c59379e SHA1 50cb1438b7c50536ebf712d16d153eac40599562 SHA256 1115b6aa00eb4e918156ae70c763534bd2f603ba888da75e4908c19c2ac3e5f7
 MD5 e60ef15deefb72a5930c498f1184aced files/lua-5.1.1-module_paths.patch 1078
 RMD160 31a3f13af427bdcae784e21a9456f9197c59379e files/lua-5.1.1-module_paths.patch 1078
@@ -65,14 +69,14 @@ EBUILD lua-5.0.3.ebuild 3091 RMD160 0c4095092f6f2ea6fb9349011a905e387cc744ef SHA
 MD5 5c82889af9fbb1331fb9966216562c02 lua-5.0.3.ebuild 3091
 RMD160 0c4095092f6f2ea6fb9349011a905e387cc744ef lua-5.0.3.ebuild 3091
 SHA256 5e5232053c6de487ba7a6103f51111f0339a6aa79838988090256548f6b7f069 lua-5.0.3.ebuild 3091
-EBUILD lua-5.1.1.ebuild 1991 RMD160 cbd1aa530c7fae60fcc7daedb63d27864166ba89 SHA1 6f2f12d696e8e7623a9386bdc4f554e53043a594 SHA256 788468593ac6a52bc1b701eb9a036b594e89e482505ea81616f3fd500fdbf298
-MD5 88bde82634b46e71553544915e46932a lua-5.1.1.ebuild 1991
-RMD160 cbd1aa530c7fae60fcc7daedb63d27864166ba89 lua-5.1.1.ebuild 1991
-SHA256 788468593ac6a52bc1b701eb9a036b594e89e482505ea81616f3fd500fdbf298 lua-5.1.1.ebuild 1991
-MISC ChangeLog 7347 RMD160 7c347ab143115b99515c6a9e1202756b7a029855 SHA1 bef7ff5e7e5f3e60f638e1e0d3f99da49bd71cf1 SHA256 1c84cf6cd2c578a22fbf60bfa7545aa6da0702b04db9da256ffc24bc05bf28d9
-MD5 f45383ed0793bdda783371e07f78c089 ChangeLog 7347
-RMD160 7c347ab143115b99515c6a9e1202756b7a029855 ChangeLog 7347
-SHA256 1c84cf6cd2c578a22fbf60bfa7545aa6da0702b04db9da256ffc24bc05bf28d9 ChangeLog 7347
+EBUILD lua-5.1.1.ebuild 2341 RMD160 d3ab66c1e0ccea36a701493dab676bcaeb3a126e SHA1 2258c7df1f6970a27a3263e39496b005a0481e4c SHA256 d12e102ab8e706902d598e75c27f22fdb04dd1c19372b2b6604ae27e73907f50
+MD5 a9005539378459f58300a182c003ff66 lua-5.1.1.ebuild 2341
+RMD160 d3ab66c1e0ccea36a701493dab676bcaeb3a126e lua-5.1.1.ebuild 2341
+SHA256 d12e102ab8e706902d598e75c27f22fdb04dd1c19372b2b6604ae27e73907f50 lua-5.1.1.ebuild 2341
+MISC ChangeLog 7551 RMD160 705640f2bad4e4e9106b1e5a5ed40a6166f236ff SHA1 7d74c44e5624b52fdd5f7fdb8aa1c98c9ae1c81e SHA256 c364bfc38e5b35fbf2b2887887b94b57992454869f5a85b062517c02202bf825
+MD5 cf5caeb011d9375b106170123272074b ChangeLog 7551
+RMD160 705640f2bad4e4e9106b1e5a5ed40a6166f236ff ChangeLog 7551
+SHA256 c364bfc38e5b35fbf2b2887887b94b57992454869f5a85b062517c02202bf825 ChangeLog 7551
 MISC metadata.xml 248 RMD160 7e7a4fe276728c6c4d6d0face7f0708dae9776d7 SHA1 b16dc683091d4a7cee7f9b8a6d6034a257df80b0 SHA256 3f6027d293a7bd953fd444ba8a1345ca6b9c00c28b35e8328386b9635d8eb71f
 MD5 c4aada614ade13541606f0901dffd61f metadata.xml 248
 RMD160 7e7a4fe276728c6c4d6d0face7f0708dae9776d7 metadata.xml 248
@@ -92,7 +96,7 @@ SHA256 5a9bfa07cd7871412eacd8a0285b69aaac0d01b635406b2d2c24569cb0c7042c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFXuaaNQqtfCuFneMRAuSIAJ9YOj5CCJsUJWK9FSz5BVwED6IF0wCgnkON
-9PaWwP+zJzuOhUrPyjNdBpw=
-=SdOu
+iD8DBQFFYxF9fNMcoUhJ7GwRAi1RAJ9wN1Cztkh9TNxwcA5kxUa/QVm5fQCgoYSU
+T/OT/zaCutgSVreYLj8AhkA=
+=wvOw
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/lua/files/lua-5.1.1-make.patch b/dev-lang/lua/files/lua-5.1.1-make.patch
index 7522e56bb08c..3dc7aee59a7e 100644
--- a/dev-lang/lua/files/lua-5.1.1-make.patch
+++ b/dev-lang/lua/files/lua-5.1.1-make.patch
@@ -63,7 +63,7 @@
 +            -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
 +
 +lua-$(V): $(LUA_O) $(LIB_NAME)
-+	$(LIBTOOL) --mode=link $(CC) -static -Wl,-E -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS)
++	$(LIBTOOL) --mode=link $(CC) -Wl,-E -o $@ $(LUA_O) $(LUA_LIBS) -llua
 +
 +luac-$(V): $(LUAC_O) $(LIB_NAME)
 +	$(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O) $(LIB_NAME)
diff --git a/dev-lang/lua/files/lua-5.1.1-make_static.patch b/dev-lang/lua/files/lua-5.1.1-make_static.patch
new file mode 100644
index 000000000000..b25cb5c89c95
--- /dev/null
+++ b/dev-lang/lua/files/lua-5.1.1-make_static.patch
@@ -0,0 +1,12 @@
+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)
+ 
+ lua-$(V): $(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)
+ 
+ luac-$(V): $(LUAC_O) $(LIB_NAME)
+ 	$(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O) $(LIB_NAME)
diff --git a/dev-lang/lua/lua-5.1.1.ebuild b/dev-lang/lua/lua-5.1.1.ebuild
index cfdd2b0b91fe..9d1343f25b8f 100644
--- a/dev-lang/lua/lua-5.1.1.ebuild
+++ b/dev-lang/lua/lua-5.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.1.ebuild,v 1.2 2006/11/18 10:55:05 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.1.ebuild,v 1.3 2006/11/21 14:47:10 mabi Exp $
 
 inherit eutils portability
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="readline"
+IUSE="readline static"
 
 RDEPEND="readline? ( sys-libs/readline )"
 DEPEND="${RDEPEND}"
@@ -28,6 +28,14 @@ src_unpack() {
 	if ! use readline ; then
 		epatch "${FILESDIR}"/${P}-readline.patch
 	fi
+
+	# Using dynamic linked lua is not recommended upstream for performance
+	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
+	# Mainly, this is of concern if your arch is poor with GPRs, like x86
+	# Note that the lua compiler is build statically anyway
+	if use static ; then
+		epatch "${FILESDIR}"/${P}-make_static.patch
+	fi
 }
 
 src_compile() {