diff options
| author |   Matti Bickel <mabi@gentoo.org> | 2009-03-21 12:42:02 +0000 |
|---|---|---|
| committer | Matti Bickel <mabi@gentoo.org> | 2009-03-21 12:42:02 +0000 |
| commit | f9efdd8fce1702c029564b4c6cf25e9b30664201 (patch) | |
| tree | 3ce4db860ee0a1b8ec393dc4b575f52b20bad4c4 /dev-lang | |
| parent | Update to use EAPI=2 and fix dependencies. Remove old revisions. (diff) | |
| download | historical-f9efdd8fce1702c029564b4c6cf25e9b30664201.tar.gz historical-f9efdd8fce1702c029564b4c6cf25e9b30664201.tar.bz2 historical-f9efdd8fce1702c029564b4c6cf25e9b30664201.zip | |
fixed bug #253594, removed useless variable
Package-Manager: portage-2.1.6.9/cvs/Linux ppc
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/lua/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/lua/Manifest | 12 | ||||
| -rw-r--r-- | dev-lang/lua/files/lua-5.1-make.patch | 10 | ||||
| -rw-r--r-- | dev-lang/lua/lua-5.1.4.ebuild | 7 |
4 files changed, 20 insertions, 17 deletions
diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog index c042321f3f68..3d58318f9adf 100644 --- a/dev-lang/lua/ChangeLog +++ b/dev-lang/lua/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/lua -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.121 2008/10/17 19:20:34 mabi Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.122 2009/03/21 12:42:02 mabi Exp $ + + 21 Mar 2009; Matti Bickel <mabi@gentoo.org> files/lua-5.1-make.patch, + lua-5.1.4.ebuild: + fixed bug #253594, removed useless variable 17 Oct 2008; Matti Bickel <mabi@gentoo.org> -lua-5.1.4-r1.ebuild: rolled back the -r1 ebuild b/c it breaks several packages (see bug #242174 diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest index 922a3b9a2b01..0e9fdc47aef0 100644 --- a/dev-lang/lua/Manifest +++ b/dev-lang/lua/Manifest @@ -13,7 +13,7 @@ AUX 5.1.3/09_all_string_byte_fix_upstream.patch 405 RMD160 7de6450892cceb335c91b AUX 5.1.3/10_all_gc_loop_fix.upstream.patch 629 RMD160 1fc17a81408ca90bf95b6e8bb729e84786b9f669 SHA1 c43c02e9b435a9fe1ec4f58bde0b153c79551eb1 SHA256 133f62d35a0c31f01b44633d9901fc5a2677e5ccfd90f548f2cae7470dae9436 AUX 5.1.3/11_all_module.upstream.patch 575 RMD160 cff7cdb7790fc9c78221181564b50911f3a39109 SHA1 618f6bf2388cbdffd8784bfdf455e30bc659aef5 SHA256 bc870719345818f881740a4dcdc3683294cf33e5619895a71e24e290007a177e AUX 5.1.3/12_all_svalue.upstream.patch 303 RMD160 383d68a00fc2d3f451def70f4629dfed5d691014 SHA1 e09c0442eba74c7acd8e08167bcc8b91c248f5eb SHA256 d5fabc1c89ef473d141a6663f6adeb25579102a975dbbd5ce57a8ac883cc48ec -AUX lua-5.1-make.patch 2154 RMD160 1e206468e137806a6c697ba040471d76948552c9 SHA1 c0dee37792e824265d4a9cd95d41df8654cbd647 SHA256 468a00db23bec0f6ddff3a9debf011bd3df0c95eae55b606315f9ed984227e23 +AUX lua-5.1-make.patch 2209 RMD160 03d6ff5c31aa2ea8cb4dec871ae4ba4d711d2240 SHA1 103efb333cef67ab3f521e49bda56f647c633f7a SHA256 3ffa297c79ad7ba378eba3de2b730670e60c7ea28181fcca4e0d0e25612997c4 AUX lua-5.1-make_static.patch 552 RMD160 1ca1c74daee2845369f13a80773755301b1d5184 SHA1 2d49989dbfd730edafac1444fd09a824a8f649b5 SHA256 dac0400c15e5ad9b77ade7e981acde3c111b51e834427280e9fdcdbbcef05812 AUX lua-5.1-module_paths.patch 1078 RMD160 31a3f13af427bdcae784e21a9456f9197c59379e SHA1 50cb1438b7c50536ebf712d16d153eac40599562 SHA256 1115b6aa00eb4e918156ae70c763534bd2f603ba888da75e4908c19c2ac3e5f7 AUX lua-5.1-readline.patch 360 RMD160 29e6f8193592ec6e551e46f953563113a72d2de2 SHA1 25baabcb1d3449c3c38726fc7de6c4abb34667a6 SHA256 1f0f90eb8103e338f1188cc884c0c59cc6afd023828c11d86b8145b2a8d1efc2 @@ -27,13 +27,13 @@ DIST lua-5.1.4.tar.gz 216679 RMD160 c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef SHA EBUILD lua-5.1.1-r2.ebuild 2710 RMD160 7bbb61441726d96daef4137a756c9b03464a16ae SHA1 47c1f20bad74033c278e1e7573354fe0940526e4 SHA256 9aa83b2dc6c1c7e881868820496deeef4e130190c23a61479d26e38e85ffdb39 EBUILD lua-5.1.3-r3.ebuild 2967 RMD160 2853f527bc2f6ecd7ccf5b910ed045d5462d11f6 SHA1 20b3f6be6e3030123ce123e9952ed96a878a4840 SHA256 4863ee049f2b57be5c9e43f00cc08a73278917a9a57f9bdd65133000fc3b35c5 EBUILD lua-5.1.3-r4.ebuild 3041 RMD160 6081734baf13ff575aa5fa9cabf8ecf98968938b SHA1 449192cef6d30eaf81b4a1e007d7da03a362f14b SHA256 da399b248158b060e937e48b32e1bd63404ad765dc2173fde87e133b5b98f768 -EBUILD lua-5.1.4.ebuild 3039 RMD160 fdd4af40ae9254c9cb2c14c11eb3542d2fb52701 SHA1 48f745d33d1906b709e64499d1f750fbf8b560d9 SHA256 60590e52bdb00047a56b551367844fa9c9ddbb5a1e4283b9d490afdb2fcdc932 -MISC ChangeLog 18131 RMD160 6266b400db4b3e078b4d9a66668623b18917caaf SHA1 a40de227d3e1fcd9e5e2833fb8b67a50ff3eca31 SHA256 e7751cf3278bb8bfa50f55576399b8956084645484db8616aef724dbc3bad719 +EBUILD lua-5.1.4.ebuild 3003 RMD160 dec0b5f3ea3bd9ba509b181363e5455f64267bb9 SHA1 38675f53d25215606d3e454c3d1e0f49ee5a38d3 SHA256 0c54be580e33907b2e2cc529ef4efa266b1ca7c396fdef3ebf3decd567923b5a +MISC ChangeLog 18270 RMD160 93fff9eaab85f353a7c37d570f6e8174a626a9ba SHA1 b0acdaf98d2e2c2d5f3c65c3060885ec0ef36526 SHA256 299897c7e218e4f16846ce24e5a97388a9de8a266f811ab161121be0c28d0bb8 MISC metadata.xml 339 RMD160 0d536a77658ffb6d8bccff7183a5bf4722d0a82d SHA1 f5bd1085f69b6e9d81e42cd711a7846ccb267e31 SHA256 6b3bedf093395def984b71f7c74ce59742c5df6592ad50f1b96c8a2499f27c8b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkkPwj4ACgkQ67wieSYcaxc4+ACdEAh+/2q4BWzasN0Ik6U4ElF7 -2yQAniXkvCn2qpLU0+KhCZhApUv0MRAN -=Q9t7 +iEYEARECAAYFAknE4Q8ACgkQfNMcoUhJ7Gzh2wCfXri8nQBXKFvuNuBNEXp7k+uT +qYEAnitW+qrFsCgEcZwHMdB6jHO7DDN6 +=jovC -----END PGP SIGNATURE----- diff --git a/dev-lang/lua/files/lua-5.1-make.patch b/dev-lang/lua/files/lua-5.1-make.patch index d051a21cb632..0c88bffedb22 100644 --- a/dev-lang/lua/files/lua-5.1-make.patch +++ b/dev-lang/lua/files/lua-5.1-make.patch @@ -44,19 +44,19 @@ + +$(LIB_NAME): $(LIB_OBJS) + $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \ -+ -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) ++ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) + +$(LIB_NAME:.la=.a): $(LIB_OBJS) -+ $(LIBTOOL) --mode=link $(CC) -static -o $(LIB_NAME:.la=.a) $(LIB_OBJS) ++ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $(LIB_NAME:.la=.a) $(LIB_OBJS) + +$(LUA_T): $(LUA_O) $(LIB_NAME) -+ $(LIBTOOL) --mode=link $(CC) -Wl,-E -o $@ $(LUA_O) $(LUA_LIBS) -llua ++ $(LIBTOOL) --mode=link $(CC) -Wl,-E $(LDFLAGS) -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) ++ $(LIBTOOL) --mode=link $(CC) -static -Wl,-E $(LDFLAGS) -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS) + +$(LUAC_T): $(LUAC_O) $(LIB_NAME) -+ $(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O) $(LIB_NAME) ++ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O) $(LIB_NAME) + +gentoo_clean: + $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac diff --git a/dev-lang/lua/lua-5.1.4.ebuild b/dev-lang/lua/lua-5.1.4.ebuild index b75d588af811..f844bf749426 100644 --- a/dev-lang/lua/lua-5.1.4.ebuild +++ b/dev-lang/lua/lua-5.1.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.4.ebuild,v 1.1 2008/09/28 10:00:26 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.4.ebuild,v 1.2 2009/03/21 12:42:02 mabi Exp $ EAPI="1" @@ -60,7 +60,6 @@ src_compile() { myflags= # what to link to liblua liblibs="-lm" - mycflags="${mycflags} -DLUA_USE_LINUX" liblibs="${liblibs} $(dlopen_lib)" # what to link to the executables @@ -70,7 +69,7 @@ src_compile() { fi cd src - emake CC="${CC}" CFLAGS="${mycflags} ${CFLAGS}" \ + emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \ RPATH="${ROOT}/usr/$(get_libdir)/" \ LUA_LIBS="${mylibs}" \ LIB_LIBS="${liblibs}" \ |