From bbd9160399010b4d42081d70e3f1bb60e9bc2f09 Mon Sep 17 00:00:00 2001 From: Matti Bickel Date: Wed, 6 Dec 2006 18:06:32 +0000 Subject: [PATCH] Reverting back to the liblua* naming Package-Manager: portage-2.1.1-r2 --- dev-lang/lua/Manifest | 18 ++++++++++++++---- dev-lang/lua/files/lua-5.1.1-make.patch | 8 ++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest index 7bd134d13de6..ea52c3b6dc4a 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,10 +33,10 @@ 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 2608 RMD160 b7254e82845eeb318daf98bf72a23d46446fe1bb SHA1 b406d5198c4784f99e8d7029a766d1533fbbffc3 SHA256 3a6561872e0d998d21728614f28d63c2dbd88f2f736fe8b57dd4f2ec9451239d -MD5 63b0040917d8f53f1808f13cff229810 files/lua-5.1.1-make.patch 2608 -RMD160 b7254e82845eeb318daf98bf72a23d46446fe1bb files/lua-5.1.1-make.patch 2608 -SHA256 3a6561872e0d998d21728614f28d63c2dbd88f2f736fe8b57dd4f2ec9451239d files/lua-5.1.1-make.patch 2608 +AUX lua-5.1.1-make.patch 2596 RMD160 a76d78441089a3a439fab70597d08f6c93f8aa34 SHA1 1c8348018b6e1a46ef978771ac8884ca854d5698 SHA256 1f52d1247957bb63c7cc7d0a0b830c7cce93078d53953365ffb72d333d62fbcb +MD5 286c8ec6928d114016308c26691dc650 files/lua-5.1.1-make.patch 2596 +RMD160 a76d78441089a3a439fab70597d08f6c93f8aa34 files/lua-5.1.1-make.patch 2596 +SHA256 1f52d1247957bb63c7cc7d0a0b830c7cce93078d53953365ffb72d333d62fbcb files/lua-5.1.1-make.patch 2596 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 @@ -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) + +iD8DBQFFdwa0fNMcoUhJ7GwRAsImAJ9UazOJfn0h7Gblvihlo7l2xC48SACeKRnv +Coe/3loNj40PbqGLp4TUCoU= +=yUD7 +-----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 ca79d3086c2e..03959c05ef47 100644 --- a/dev-lang/lua/files/lua-5.1.1-make.patch +++ b/dev-lang/lua/files/lua-5.1.1-make.patch @@ -36,8 +36,8 @@ + mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) + 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) liblualib.la $(INSTALL_LIB) -+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblualib.a $(INSTALL_LIB) ++ 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,36 @@ @@ -51,7 +51,7 @@ +# The following rules use libtool for compiling and linking in order to +# provide shared library support. + -+LIB_NAME = liblualib.la ++LIB_NAME = liblua.la +LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) + +%.lo %.o: %.c @@ -65,7 +65,7 @@ + $(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) -llualib ++ $(LIBTOOL) --mode=link $(CC) -Wl,-E -o $@ $(LUA_O) $(LUA_LIBS) -llua + +lua_test: $(LUA_O) $(LIB_NAME) + $(LIBTOOL) --mode=link $(CC) -static -Wl,-E -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS) -- 2.26.2