Build static library too, do tests with static lua

Package-Manager: portage-2.1.1-r2

5 files changed, 55 insertions, 34 deletions

diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 4bebfe2d0a25..4066c2bdb3d3 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.54 2006/11/24 21:59:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.55 2006/11/27 23:02:36 mabi Exp $
+
+  27 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:
+  Build static library too, do tests with static lua
 
   24 Nov 2006; Markus Rothe <corsair@gentoo.org> lua-5.1.1.ebuild:
   Added ~ppc64; bug #155518
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index d80451dc27b2..1f706ed1a315 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lua-4.0-config.patch 840 RMD160 084f61c266550c0a068fb1349990502a33141cad SHA1 d1b31c7eedc6114a39fbfd31084cef899fa7a814 SHA256 b38627a9720bdd8a3ba79ec5418699472f0e16173e7e29ffd844dfd895aad559
 MD5 6365486c1e78a5fc73e34a3bda3feef7 files/lua-4.0-config.patch 840
 RMD160 084f61c266550c0a068fb1349990502a33141cad files/lua-4.0-config.patch 840
@@ -30,14 +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 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-make.patch 2593 RMD160 64fd9ad816b9e80a4422e0b8a19e05fde43c4d4e SHA1 0f80ceb3e8eaf47d0b31ddec9395a37d625700f1 SHA256 292122b34c1d888674fe53f8bf49d517865955d9d5b4218fb3d45d254a564808
+MD5 029dbebde260f1b4bc4ade3f9af00d92 files/lua-5.1.1-make.patch 2593
+RMD160 64fd9ad816b9e80a4422e0b8a19e05fde43c4d4e files/lua-5.1.1-make.patch 2593
+SHA256 292122b34c1d888674fe53f8bf49d517865955d9d5b4218fb3d45d254a564808 files/lua-5.1.1-make.patch 2593
+AUX lua-5.1.1-make_static.patch 542 RMD160 d42a93919d01dc15a4281901f74558db65214f2a SHA1 b7c82c65201654068644ee99e345d163b215fc21 SHA256 ea9098664e1e43b37465ecc4028bd0fbe08c0f73772914b6fe38bd13637090ba
+MD5 ba8ddaa07ecbccd1a1f8ff9411319e7a files/lua-5.1.1-make_static.patch 542
+RMD160 d42a93919d01dc15a4281901f74558db65214f2a files/lua-5.1.1-make_static.patch 542
+SHA256 ea9098664e1e43b37465ecc4028bd0fbe08c0f73772914b6fe38bd13637090ba files/lua-5.1.1-make_static.patch 542
 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
@@ -66,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 2350 RMD160 6f8f383620cd1a5857031c5da4f6b1b627b3edbb SHA1 ba3cde076d9cf889b8582fb7ad2d70d9d442fe21 SHA256 a288657c27f573aa61669216f3790162bfb25828debfa334290e2065d7dee74a
-MD5 250a37311885a9986971924b6aef51e1 lua-5.1.1.ebuild 2350
-RMD160 6f8f383620cd1a5857031c5da4f6b1b627b3edbb lua-5.1.1.ebuild 2350
-SHA256 a288657c27f573aa61669216f3790162bfb25828debfa334290e2065d7dee74a lua-5.1.1.ebuild 2350
-MISC ChangeLog 7650 RMD160 39c9d0f5c69cdfba397b2003199feb3a3e3df504 SHA1 7c5c245972f814856299f440481546f5fb5d99a9 SHA256 c8194fe7280b8c2888cb2a488ad9eff04ef2789c5941005943a89a237a827671
-MD5 eaa5d1e093be9a24c3e0d1ab091a31ae ChangeLog 7650
-RMD160 39c9d0f5c69cdfba397b2003199feb3a3e3df504 ChangeLog 7650
-SHA256 c8194fe7280b8c2888cb2a488ad9eff04ef2789c5941005943a89a237a827671 ChangeLog 7650
+EBUILD lua-5.1.1.ebuild 2395 RMD160 a905b11253a6c370140c48f452589f758d47ed52 SHA1 314847e5ed75e37ea821d2f757f40966ad4e8b5e SHA256 9751a2da0ddc764fb48f2c07daadb23eed52b630b6c195601147a59adb28d589
+MD5 6bd292fc97610f56ded3aeb92783d96a lua-5.1.1.ebuild 2395
+RMD160 a905b11253a6c370140c48f452589f758d47ed52 lua-5.1.1.ebuild 2395
+SHA256 9751a2da0ddc764fb48f2c07daadb23eed52b630b6c195601147a59adb28d589 lua-5.1.1.ebuild 2395
+MISC ChangeLog 7830 RMD160 8c9ec62443e4942e321c206069b0a8b9bdb096dd SHA1 3646968782a5d99027907f38accc0519e82d1094 SHA256 51c911845a0fa3b1d09e37a110c43816fbd2b689fad9c790a1b34130f71efcbc
+MD5 d436e9a5a5db45e595512ace5884937b ChangeLog 7830
+RMD160 8c9ec62443e4942e321c206069b0a8b9bdb096dd ChangeLog 7830
+SHA256 51c911845a0fa3b1d09e37a110c43816fbd2b689fad9c790a1b34130f71efcbc ChangeLog 7830
 MISC metadata.xml 248 RMD160 7e7a4fe276728c6c4d6d0face7f0708dae9776d7 SHA1 b16dc683091d4a7cee7f9b8a6d6034a257df80b0 SHA256 3f6027d293a7bd953fd444ba8a1345ca6b9c00c28b35e8328386b9635d8eb71f
 MD5 c4aada614ade13541606f0901dffd61f metadata.xml 248
 RMD160 7e7a4fe276728c6c4d6d0face7f0708dae9776d7 metadata.xml 248
@@ -90,3 +93,10 @@ SHA256 4a4b5a506f9226dc2e8bb8d52129a6c4b66f27b7d9d0a91c81b0379605c34d0f files/di
 MD5 541613cc1c7f33c6ab0e8858d2812bc2 files/digest-lua-5.1.1 229
 RMD160 8dbfca4720b6ff909dc6f2fa3496373083970771 files/digest-lua-5.1.1 229
 SHA256 5a9bfa07cd7871412eacd8a0285b69aaac0d01b635406b2d2c24569cb0c7042c files/digest-lua-5.1.1 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFa26WfNMcoUhJ7GwRAheQAJ0SiL1WoSEMwtuqY3tIyob4ZGRVAgCghge9
+/CbLhRIg7lw0j9Iw4yZUPK0=
+=3hHH
+-----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 3dc7aee59a7e..b05c841e9731 100644
--- a/dev-lang/lua/files/lua-5.1.1-make.patch
+++ b/dev-lang/lua/files/lua-5.1.1-make.patch
@@ -15,7 +15,7 @@
  
  # Utilities.
  CP= cp
-@@ -127,3 +127,21 @@
+@@ -127,3 +127,22 @@
  .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho newer
  
  # (end of Makefile)
@@ -34,12 +34,13 @@
 +
 +gentoo_install:
 +	mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN)
-+	cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua-$(V) luac-$(V) $(INSTALL_BIN)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac $(INSTALL_BIN)
 +	cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
 +	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB)
++	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.a $(INSTALL_LIB)
 --- /home/mabi/gentoo/lua-5.1.1.orig/src/Makefile	2006-03-22 01:41:49.000000000 +0100
 +++ ./src/Makefile	2006-11-16 02:10:27.000000000 +0100
-@@ -176,3 +176,32 @@
+@@ -176,3 +176,36 @@
    ltm.h lzio.h lmem.h lopcodes.h lundump.h
  
  # (end of Makefile)
@@ -48,9 +49,7 @@
 +export LIB_VERSION = 6:1:1
 +
 +# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.  While we are at it, our desired version
-+# suffixes are added to the targets, preventing conflicts with rules in
-+# the upstream makefile.
++# provide shared library support.
 +
 +LIB_NAME = liblua.la
 +LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
@@ -58,17 +57,23 @@
 +%.lo %.o: %.c
 +	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
 +
-+$(LIB_NAME) $(LIB_NAME:.la=.a): $(LIB_OBJS)
++$(LIB_NAME): $(LIB_OBJS)
 +	$(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
 +            -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
 +
-+lua-$(V): $(LUA_O) $(LIB_NAME)
++$(LIB_NAME:.la=.a): $(LIB_OBJS)
++	$(LIBTOOL) --mode=link $(CC) -static -o $(LIB_NAME:.la=.a) $(LIB_OBJS)
++
++lua: $(LUA_O) $(LIB_NAME)
 +	$(LIBTOOL) --mode=link $(CC) -Wl,-E -o $@ $(LUA_O) $(LUA_LIBS) -llua
 +
-+luac-$(V): $(LUAC_O) $(LIB_NAME)
++lua_test: $(LUA_O) $(LIB_NAME)
++	$(LIBTOOL) --mode=link $(CC) -static -Wl,-E -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS)
++
++luac: $(LUAC_O) $(LIB_NAME)
 +	$(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O) $(LIB_NAME)
 +
 +gentoo_clean:
-+	$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua-$(V) luac-$(V)
++	$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac
 +
-+gentoo_all: $(LIB_NAME) lua-$(V) luac-$(V)
++gentoo_all: $(LIB_NAME) $(LIB_NAME:.la=.a) lua lua_test luac
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
index b25cb5c89c95..53c5bd1a9cf8 100644
--- a/dev-lang/lua/files/lua-5.1.1-make_static.patch
+++ b/dev-lang/lua/files/lua-5.1.1-make_static.patch
@@ -4,9 +4,9 @@ diff -ru lua-5.1.1.orig/src/Makefile lua-5.1.1/src/Makefile
 @@ -196,7 +196,7 @@
              -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
  
- lua-$(V): $(LUA_O) $(LIB_NAME)
+ lua: $(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)
+ luac: $(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 cf8bf7351dc0..e81b59b210fc 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.4 2006/11/24 21:59:31 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.1.ebuild,v 1.5 2006/11/27 23:02:36 mabi Exp $
 
 inherit eutils portability
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~ppc ppc64 ~x86"
+KEYWORDS="~ppc ~ppc64 ~x86"
 IUSE="readline static"
 
 RDEPEND="readline? ( sys-libs/readline )"
@@ -62,6 +62,8 @@ src_compile() {
 			LIB_LIBS="${liblibs}" \
 			V=${PV} \
 			gentoo_all || die "emake failed"
+
+	mv lua_test ../test/lua.static
 }
 
 src_install() {
@@ -85,10 +87,10 @@ src_test() {
 
 	cd "${S}"
 	for test in ${positive}; do
-		src/${P} test/${test}.lua &> /dev/null || die "test $test failed"
+		test/lua.static test/${test}.lua &> /dev/null || die "test $test failed"
 	done
 
 	for test in ${negative}; do
-		src/${P} test/${test}.lua &> /dev/null && die "test $test failed"
+		test/lua.static test/${test}.lua &> /dev/null && die "test $test failed"
 	done
 }