diff options
| author |   Matti Bickel <mabi@gentoo.org> | 2006-12-01 17:21:29 +0000 |
|---|---|---|
| committer | Matti Bickel <mabi@gentoo.org> | 2006-12-01 17:21:29 +0000 |
| commit | 8ae4c84599c39605fd95407f1fe07160c476048f (patch) | |
| tree | 302b9daeba49991ca1a5d0c03b4d065513e73f4c /dev-lang/lua/files | |
| parent | ppc stable, bug #151836 (diff) | |
| download | historical-8ae4c84599c39605fd95407f1fe07160c476048f.tar.gz historical-8ae4c84599c39605fd95407f1fe07160c476048f.tar.bz2 historical-8ae4c84599c39605fd95407f1fe07160c476048f.zip | |
Fix bug #106446, change name of liblua back to liblualib
Package-Manager: portage-2.1.1-r2
Diffstat (limited to 'dev-lang/lua/files')
| -rw-r--r-- | dev-lang/lua/files/lua-5.1.1-make.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 b05c841e9731..ca79d3086c2e 100644 --- a/dev-lang/lua/files/lua-5.1.1-make.patch +++ b/dev-lang/lua/files/lua-5.1.1-make.patch @@ -30,14 +30,14 @@ + cd src; $(MAKE) $@ + +gentoo_test: gentoo_linux -+ src/lua-$(V) test/hello.lua ++ test/lua.static test/hello.lua + +gentoo_install: + 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) liblua.la $(INSTALL_LIB) -+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.a $(INSTALL_LIB) ++ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblualib.la $(INSTALL_LIB) ++ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblualib.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 = liblua.la ++LIB_NAME = liblualib.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) -llua ++ $(LIBTOOL) --mode=link $(CC) -Wl,-E -o $@ $(LUA_O) $(LUA_LIBS) -llualib + +lua_test: $(LUA_O) $(LIB_NAME) + $(LIBTOOL) --mode=link $(CC) -static -Wl,-E -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS) |