From: Matti Bickel Date: Tue, 23 Jan 2007 09:47:09 +0000 (+0000) Subject: Fixing make.patch X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ae6b585948a510e10c85c72b8fb7e0f59a741ff5;p=gentoo.git Fixing make.patch Package-Manager: portage-2.1.1-r2 --- diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog index 12cdeb261457..30089be70432 100644 --- a/dev-lang/lua/ChangeLog +++ b/dev-lang/lua/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/lua # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.62 2007/01/22 21:39:57 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.63 2007/01/23 09:47:09 mabi Exp $ + + 23 Jan 2007; Matti Bickel files/lua-5.1.1-make.patch: + Fixing slotted fallout in make.patch 22 Jan 2007; Matti Bickel -files/lua-5.1.1-Makefile.patch, -lua-5.0.3-r1.ebuild, diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest index 62f78ce269c2..41345194d6d5 100644 --- a/dev-lang/lua/Manifest +++ b/dev-lang/lua/Manifest @@ -29,10 +29,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 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.patch 2596 RMD160 2d905d74c96f83acd5c27e884942a5068ff1b655 SHA1 ac2ad37086676a0dee9d231dfe1af6787973b3ed SHA256 5413decb6d74e5803c2e9b80c32b8add5559d05ba4da9b0d60f1a6e221df3125 +MD5 a84c15c14a2c232e48e2668487df4f30 files/lua-5.1.1-make.patch 2596 +RMD160 2d905d74c96f83acd5c27e884942a5068ff1b655 files/lua-5.1.1-make.patch 2596 +SHA256 5413decb6d74e5803c2e9b80c32b8add5559d05ba4da9b0d60f1a6e221df3125 files/lua-5.1.1-make.patch 2596 AUX lua-5.1.1-make_static.patch 552 RMD160 1ca1c74daee2845369f13a80773755301b1d5184 SHA1 2d49989dbfd730edafac1444fd09a824a8f649b5 SHA256 dac0400c15e5ad9b77ade7e981acde3c111b51e834427280e9fdcdbbcef05812 MD5 33ce8e585ae99d47f49b66ef26db434b files/lua-5.1.1-make_static.patch 552 RMD160 1ca1c74daee2845369f13a80773755301b1d5184 files/lua-5.1.1-make_static.patch 552 @@ -64,10 +64,10 @@ EBUILD lua-5.1.1.ebuild 2409 RMD160 6bf631b9855b07bf15b784898be2b495e328ebb5 SHA MD5 d1a0b67ec27adc9a4850cf611e2ea1d1 lua-5.1.1.ebuild 2409 RMD160 6bf631b9855b07bf15b784898be2b495e328ebb5 lua-5.1.1.ebuild 2409 SHA256 6d434295cd59062f307ddb428e4ef69cf530d568a5e28f3475e1ff5cf3be321d lua-5.1.1.ebuild 2409 -MISC ChangeLog 9078 RMD160 9eeef9d2335e3cf5cee8e8bbeeb08177a8a52bcf SHA1 9fe6b1dae6784cd21624003324dacec2d91aa5dc SHA256 65234819c314025dd6fab5fc8b96082106fc5b4b06f99f4ee37461f00acbb8f9 -MD5 6e67a9bb65160367e0ff615fdc805d24 ChangeLog 9078 -RMD160 9eeef9d2335e3cf5cee8e8bbeeb08177a8a52bcf ChangeLog 9078 -SHA256 65234819c314025dd6fab5fc8b96082106fc5b4b06f99f4ee37461f00acbb8f9 ChangeLog 9078 +MISC ChangeLog 9192 RMD160 aedb0337245bbfbd3a618469b3ed042663955344 SHA1 ee104dac25c28c41b85b49feaab21b18b07c7972 SHA256 2d65a9e0eea1fc74c5adc3b8e1c95b58433083c1e9900a72eda478fdd6350ff6 +MD5 8690b923b2c942ec779565885ca83814 ChangeLog 9192 +RMD160 aedb0337245bbfbd3a618469b3ed042663955344 ChangeLog 9192 +SHA256 2d65a9e0eea1fc74c5adc3b8e1c95b58433083c1e9900a72eda478fdd6350ff6 ChangeLog 9192 MISC metadata.xml 246 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 SHA1 76fdc0af8e2d1dbb1214b95c49f8cd2da3d3832a SHA256 6a089a75a70b3b69d4cae78762fdc69afa25678c5b8692c61245f50bc49ab531 MD5 ae5edc540c3c3ae7307d2ac4c0e16773 metadata.xml 246 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 metadata.xml 246 @@ -84,7 +84,7 @@ SHA256 5a9bfa07cd7871412eacd8a0285b69aaac0d01b635406b2d2c24569cb0c7042c files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFtS8kfNMcoUhJ7GwRArxjAJ9jEJGgJQcgBpuMYN0FKrS0zDcUxACeIaXv -fjIdAG2CgSym8QEyFwigmo8= -=oIxY +iD8DBQFFtdmUfNMcoUhJ7GwRAjEUAJ9TnpqagjaioDS4Fje6OpJhZadTigCgl9Sf +m09WO4e77sekJicsRUk1l1U= +=1y8Q -----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 03959c05ef47..fb95d253422d 100644 --- a/dev-lang/lua/files/lua-5.1.1-make.patch +++ b/dev-lang/lua/files/lua-5.1.1-make.patch @@ -1,5 +1,5 @@ ---- /home/mabi/gentoo/lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200 -+++ ./Makefile 2006-11-16 02:16:53.000000000 +0100 +--- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200 ++++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100 @@ -22,10 +22,10 @@ # How to install. You may prefer "install" instead of "cp" if you have it. # To remove debug information from binaries, use "install -s" in INSTALL_EXEC. @@ -38,8 +38,8 @@ + 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 +--- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100 ++++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100 @@ -176,3 +176,36 @@ ltm.h lzio.h lmem.h lopcodes.h lundump.h @@ -64,16 +64,16 @@ +$(LIB_NAME:.la=.a): $(LIB_OBJS) + $(LIBTOOL) --mode=link $(CC) -static -o $(LIB_NAME:.la=.a) $(LIB_OBJS) + -+lua: $(LUA_O) $(LIB_NAME) ++$(LUA_T): $(LUA_O) $(LIB_NAME) + $(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) + -+luac: $(LUAC_O) $(LIB_NAME) ++$(LUAC_T): $(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 luac + -+gentoo_all: $(LIB_NAME) $(LIB_NAME:.la=.a) lua lua_test luac ++gentoo_all: $(LIB_NAME) $(LIB_NAME:.la=.a) $(LUA_T) lua_test $(LUAC_T)