[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/lua/files/, dev-lang/lua/
commit: 0c54a5770d360c92a934a4e6cafcd8acb71e807f Author: Fabian Groffen gentoo org> AuthorDate: Mon Jan 4 20:18:20 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Mon Jan 4 20:18:20 2016 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0c54a577 dev-lang/lua: sync versions from gx86 Package-Manager: portage-2.2.20-prefix RepoMan-Options: --force dev-lang/lua/Manifest| 1 + dev-lang/lua/files/lua-5.1-make-r2.patch | 97 ++ dev-lang/lua/lua-5.1.5-r100.ebuild | 138 +++ dev-lang/lua/lua-5.1.5-r3.ebuild | 133 + 4 files changed, 369 insertions(+) diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest index a1c8527..3404943 100644 --- a/dev-lang/lua/Manifest +++ b/dev-lang/lua/Manifest @@ -1,2 +1,3 @@ DIST lua-5.1.4.tar.gz 216679 SHA256 b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a SHA512 bc542fe8535826ac1e49b03a8f238cf049724b02c14718f8162cfeaf735a5e6c58412ff18dbe7a38e4cc4433f3d1e702554e9b24b5f021634b4280880980f40f WHIRLPOOL 2d8fdf77e31314eed68d8ace368a62a608a58114bea5c8797a2e2d327ca870dd4450ede494733d49c97bb447c97adf08610027df3206999a35fb49cde77448fd +DIST lua-5.1.5.tar.gz 221213 SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9 WHIRLPOOL 9dac93b73b9ad1ef6c69e0aa11fb53d5efe89274b65c55a1ac30bab23e8a255851b0e44306db54212b1d481e658cecd38e5ff22a25e1fa974858b7b03fb45b75 DIST lua-5.2.3.tar.gz 251195 SHA256 13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d SHA512 264bb7c8db2f190ef0ca38584ec81999ab588f54e03119c5214c40bb8925b0eb407fac483a03e40cc8a220f6748ddff7d3a7392da3803418276b0d263b866449 WHIRLPOOL d278a1e38416bcf7f82eb3e7fd5fb423e60ccb69e9d57a937070516ff8be2d19a98bbfdaf37ec6fd6fb3ef2d625900977ca0cb47e46cb0ede5ebd5d37a9454ef diff --git a/dev-lang/lua/files/lua-5.1-make-r2.patch b/dev-lang/lua/files/lua-5.1-make-r2.patch new file mode 100644 index 000..2905a62 --- /dev/null +++ b/dev-lang/lua/files/lua-5.1-make-r2.patch @@ -0,0 +1,97 @@ +diff -ru lua-5.1.5.orig/Makefile lua-5.1.5/Makefile +--- lua-5.1.5.orig/Makefile2014-04-15 17:43:34.845435031 +0200 lua-5.1.5/Makefile 2014-04-15 19:05:08.669304987 +0200 +@@ -11,7 +11,7 @@ + # so take care if INSTALL_TOP is not an absolute path. + INSTALL_TOP= /usr/local + INSTALL_BIN= $(INSTALL_TOP)/bin +-INSTALL_INC= $(INSTALL_TOP)/include ++INSTALL_INC= $(INSTALL_TOP)/include/lua$V + INSTALL_LIB= $(INSTALL_TOP)/lib + INSTALL_MAN= $(INSTALL_TOP)/man/man1 + # +@@ -126,3 +126,21 @@ + .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho + + # (end of Makefile) ++ ++# Use libtool for binary installs, etc. ++ ++export V ++export LIBTOOL = libtool --quiet --tag=CC ++# See libtool manual about how to set this ++ ++gentoo_clean: ++ cd src; $(MAKE) $@ ++ ++gentoo_test: gentoo_linux ++ test/lua.static test/hello.lua ++ ++gentoo_install: ++ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) ++ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN) ++ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) ++ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB) +diff -ru lua-5.1.5.orig/src/Makefile lua-5.1.5/src/Makefile +--- lua-5.1.5.orig/src/Makefile2014-04-15 17:43:34.844435031 +0200 lua-5.1.5/src/Makefile 2014-04-15 18:07:21.427397122 +0200 +@@ -29,10 +29,10 @@ + LIB_O=lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \ + lstrlib.o loadlib.o linit.o + +-LUA_T=lua ++LUA_T= lua$V + LUA_O=lua.o + +-LUAC_T= luac ++LUAC_T= luac$V + LUAC_O= luac.o print.o + + ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) +@@ -51,10 +51,10 @@ + $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files + $(RANLIB) $@ + +-$(LUA_T): $(LUA_O) $(LUA_A) ++origin$(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + +-$(LUAC_T): $(LUAC_O) $(LUA_A) ++origin$(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + + clean: +@@ -180,3 +180,33 @@ + ltm.h lzio.h lmem.h lopcodes.h lundump.h + + # (end of Makefile) ++ ++export LIBTOOL = libtool --tag=CC ++export LIB_VERSION = 5:1:5 ++ ++# The following rules use libtool for compiling and linking in order to ++# provide shared library support. ++ ++LIB_NAME = liblua$V.la ++LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) ++ ++%.lo %.o: %.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< ++ ++$(LIB_NAME): $(LIB_OBJS) ++ $(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \ ++-rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) ++ ++$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME) ++
[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/lua/files/, dev-lang/lua/files/5.1.4/, dev-lang/lua/files/5.2.0/, ...
commit: a03278a74fee2e3e1c1bd5083d9d627abc51018e Author: Fabian Groffen gentoo org> AuthorDate: Mon Jan 4 20:32:37 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Mon Jan 4 20:32:37 2016 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a03278a7 dev-lang/lua: migrated to gx86 dev-lang/lua/Manifest | 3 - .../5.1.3/01_all_LUAI_MAXCSTACK.upstream.patch | 17 --- .../5.1.3/02_all_coroutine.resume.upstream.patch | 12 -- .../5.1.3/03_all_lua_checkstack.upstream.patch | 22 .../lua/files/5.1.3/04_all_unpack.upstream.patch | 20 --- .../files/5.1.3/05_all_validator.upstream.patch| 44 --- .../lua/files/5.1.3/06_all_c_stack.upstream.patch | 21 .../files/5.1.3/07_all_validator2.upstream.patch | 25 .../5.1.3/08_all_code_injection.upstream.patch | 12 -- .../5.1.3/09_all_string_byte_fix_upstream.patch| 12 -- .../files/5.1.3/10_all_gc_loop_fix.upstream.patch | 19 --- .../lua/files/5.1.3/11_all_module.upstream.patch | 16 --- .../lua/files/5.1.3/12_all_svalue.upstream.patch | 11 -- .../5.1.4/01_all_boolean_expression.upstream.patch | 48 --- .../lua/files/5.1.4/02_all_table.upstream.patch| 22 .../5.1.4/03_all_debug_getfenv.upstream.patch | 10 -- .../5.1.4/04_all_gc_performance.upstream.patch | 14 --- .../5.1.4/05_all_string_format.upstream.patch | 21 .../lua/files/5.1.4/06_all_io_read.upstream.patch | 15 --- .../5.2.0/01_all_memory_hoarding.upstream.patch| 49 .../02_all_hex_number_handling.upstream.patch | 26 dev-lang/lua/files/configure.in| 5 - dev-lang/lua/files/lua-5.1-make-no-libtool.patch | 68 -- dev-lang/lua/files/lua-5.1-make-r1.patch | 66 -- dev-lang/lua/files/lua-5.1-make-r2.patch | 97 --- dev-lang/lua/files/lua-5.1-make.patch | 64 -- dev-lang/lua/files/lua-5.1-make_static-r1.patch| 12 -- dev-lang/lua/files/lua-5.1-make_static.patch | 12 -- dev-lang/lua/files/lua-5.1-module_paths.patch | 30 - dev-lang/lua/files/lua-5.1-readline.patch | 10 -- dev-lang/lua/files/lua-5.1.3-deprecated.patch | 46 --- dev-lang/lua/files/lua-5.1.3-test.patch| 11 -- dev-lang/lua/files/lua-5.1.4-deprecated.patch | 46 --- dev-lang/lua/files/lua-5.1.4-test.patch| 11 -- dev-lang/lua/files/lua-5.2-make-r1.patch | 75 --- dev-lang/lua/files/lua-5.2-make.patch | 60 - dev-lang/lua/files/lua.pc | 31 - dev-lang/lua/lua-5.1.4-r8.ebuild | 124 -- dev-lang/lua/lua-5.1.5-r100.ebuild | 138 - dev-lang/lua/lua-5.1.5-r3.ebuild | 133 dev-lang/lua/lua-5.2.3-r1.ebuild | 136 dev-lang/lua/metadata.xml | 13 -- 42 files changed, 1627 deletions(-) diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest deleted file mode 100644 index 3404943..000 --- a/dev-lang/lua/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST lua-5.1.4.tar.gz 216679 SHA256 b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a SHA512 bc542fe8535826ac1e49b03a8f238cf049724b02c14718f8162cfeaf735a5e6c58412ff18dbe7a38e4cc4433f3d1e702554e9b24b5f021634b4280880980f40f WHIRLPOOL 2d8fdf77e31314eed68d8ace368a62a608a58114bea5c8797a2e2d327ca870dd4450ede494733d49c97bb447c97adf08610027df3206999a35fb49cde77448fd -DIST lua-5.1.5.tar.gz 221213 SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9 WHIRLPOOL 9dac93b73b9ad1ef6c69e0aa11fb53d5efe89274b65c55a1ac30bab23e8a255851b0e44306db54212b1d481e658cecd38e5ff22a25e1fa974858b7b03fb45b75 -DIST lua-5.2.3.tar.gz 251195 SHA256 13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d SHA512 264bb7c8db2f190ef0ca38584ec81999ab588f54e03119c5214c40bb8925b0eb407fac483a03e40cc8a220f6748ddff7d3a7392da3803418276b0d263b866449 WHIRLPOOL d278a1e38416bcf7f82eb3e7fd5fb423e60ccb69e9d57a937070516ff8be2d19a98bbfdaf37ec6fd6fb3ef2d625900977ca0cb47e46cb0ede5ebd5d37a9454ef diff --git a/dev-lang/lua/files/5.1.3/01_all_LUAI_MAXCSTACK.upstream.patch b/dev-lang/lua/files/5.1.3/01_all_LUAI_MAXCSTACK.upstream.patch deleted file mode 100644 index a51e467..000 --- a/dev-lang/lua/files/5.1.3/01_all_LUAI_MAXCSTACK.upstream.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -rdu lua-5.1.3.orig/src/luaconf.h lua-5.1.3/src/luaconf.h lua-5.1.3.orig/src/luaconf.h 2008-02-12 16:17:59.0 + -+++ lua-5.1.3/src/luaconf.h2008-02-12 16:26:32.0 + -@@ -447,10 +447,10 @@ - @* can use. - ** CHANGE it if you need lots of (Lua) stack space
[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/lua/
commit: 2a6686da4cb8391442ade9193f60940b0a63650e Author: Fabian Groffen gentoo org> AuthorDate: Mon Jan 4 19:10:49 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Mon Jan 4 19:10:49 2016 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2a6686da dev-lang/lua: cleanup 5.2.1 Package-Manager: portage-2.2.20-prefix dev-lang/lua/lua-5.2.1.ebuild | 20 +--- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/dev-lang/lua/lua-5.2.1.ebuild b/dev-lang/lua/lua-5.2.1.ebuild index 58e4a25..3cafe75 100644 --- a/dev-lang/lua/lua-5.2.1.ebuild +++ b/dev-lang/lua/lua-5.2.1.ebuild @@ -39,14 +39,6 @@ src_prepare() { fi fi - # fix libtool and ld usage on OSX - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i \ - -e 's/libtool/glibtool/g' \ - -e 's/-Wl,-E//g' \ - Makefile src/Makefile - fi - [ -d "${FILESDIR}/${PV}" ] && \ EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch @@ -74,17 +66,7 @@ src_compile() { tc-export CC # what to link to liblua - liblibs="-lm" - if [[ $CHOST == *-darwin* ]]; then - mycflags="${mycflags} -DLUA_USE_MACOSX" - elif [[ ${CHOST} == *-winnt* ]]; then - : # nothing for now... - elif [[ ${CHOST} == *-interix* ]]; then - : # nothing here too... - else # building for standard linux (and bsd too) - mycflags="${mycflags} -DLUA_USE_LINUX" - fi - liblibs="${liblibs} $(dlopen_lib)" + liblibs="-lm $(dlopen_lib)" # what to link to the executables mylibs=
[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/lua/
commit: 6d6e76fcd87c3eef8a7a5ec7cc46d3a7ae2367e7 Author: Fabian Groffen gentoo org> AuthorDate: Mon Jan 4 19:32:40 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Mon Jan 4 19:32:40 2016 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6d6e76fc dev-lang/lua: bring 5.2.1 up to rev 1.4 Package-Manager: portage-2.2.20-prefix dev-lang/lua/lua-5.2.1.ebuild | 37 + 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dev-lang/lua/lua-5.2.1.ebuild b/dev-lang/lua/lua-5.2.1.ebuild index 3cafe75..3d01ece 100644 --- a/dev-lang/lua/lua-5.2.1.ebuild +++ b/dev-lang/lua/lua-5.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.1.ebuild,v 1.1 2012/07/04 19:34:20 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/Attic/lua-5.2.1.ebuild,v 1.4 2014/07/04 21:21:21 mabi dead $ EAPI=4 @@ -23,28 +23,14 @@ PDEPEND="emacs? ( app-emacs/lua-mode )" src_prepare() { local PATCH_PV=$(get_version_component_range 1-2) - if [[ ${CHOST} == *-winnt* ]]; then - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-no-libtool.patch - else - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch - - # Using dynamic linked lua is not recommended for performance - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519 - # Mainly, this is of concern if your arch is poor with GPRs, like x86 - # Note that this only affects the interpreter binary (named lua), not the lua - # compiler (built statically) nor the lua libraries (both shared and static - # are installed) - if use static ; then - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile - fi - fi + epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch [ -d "${FILESDIR}/${PV}" ] && \ EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch sed -i \ - -e 's:\(LUA_ROOT\s*\).*:\1"/usr/":' \ - -e "s:\(LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \ + -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \ + -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \ src/luaconf.h \ || die "failed patching luaconf.h" @@ -57,6 +43,16 @@ src_prepare() { sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h fi + # Using dynamic linked lua is not recommended for performance + # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519 + # Mainly, this is of concern if your arch is poor with GPRs, like x86 + # Note that this only affects the interpreter binary (named lua), not the lua + # compiler (built statically) nor the lua libraries (both shared and static + # are installed) + if use static ; then + sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile + fi + # upstream does not use libtool, but we do (see bug #336167) cp "${FILESDIR}/configure.in" "${S}" eautoreconf @@ -66,7 +62,8 @@ src_compile() { tc-export CC # what to link to liblua - liblibs="-lm $(dlopen_lib)" + liblibs="-lm" + liblibs="${liblibs} $(dlopen_lib)" # what to link to the executables mylibs=
[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/lua/files/, dev-lang/lua/
commit: f39c63c49dda6e5ce7b74ae36af82a192130f437 Author: Fabian Groffen gentoo org> AuthorDate: Mon Jan 4 20:04:26 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Mon Jan 4 20:04:26 2016 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f39c63c4 dev-lang/lua: align versions more with gx86 Package-Manager: portage-2.2.20-prefix dev-lang/lua/Manifest | 3 +- dev-lang/lua/files/lua-5.2-make-r1.patch | 75 +++ dev-lang/lua/lua-5.1.4-r4.ebuild | 139 - dev-lang/lua/lua-5.1.4-r8.ebuild | 46 +++ dev-lang/lua/lua-5.2.0-r1.ebuild | 128 --- .../lua/{lua-5.2.1.ebuild => lua-5.2.3-r1.ebuild} | 98 +-- 6 files changed, 154 insertions(+), 335 deletions(-) diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest index 3a96f90..a1c8527 100644 --- a/dev-lang/lua/Manifest +++ b/dev-lang/lua/Manifest @@ -1,3 +1,2 @@ DIST lua-5.1.4.tar.gz 216679 SHA256 b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a SHA512 bc542fe8535826ac1e49b03a8f238cf049724b02c14718f8162cfeaf735a5e6c58412ff18dbe7a38e4cc4433f3d1e702554e9b24b5f021634b4280880980f40f WHIRLPOOL 2d8fdf77e31314eed68d8ace368a62a608a58114bea5c8797a2e2d327ca870dd4450ede494733d49c97bb447c97adf08610027df3206999a35fb49cde77448fd -DIST lua-5.2.0.tar.gz 246377 SHA256 cabe379465aa8e388988073d59b69e76ba0025429d2c1da80821a252cdf6be0d SHA512 48c4a35323309c983a785a320b9a5058401c8b6cc0a4296ace66ab13ecb435d5274fdbaa28498f232619bda3bdee6eae9d264421406a83e55a418e2a6e95388a WHIRLPOOL d14eeaa0322b611a65d698faf94e00611e3c4942363e2db068891838f6f7abab9b2ca509b6e3791b0f734ee69e41e07ac63a372d0bee60c9e8ffcc5a0f693909 -DIST lua-5.2.1.tar.gz 249882 SHA256 64304da87976133196f9e4c15250b70f67b6ed80d7cfd7b3b982b5177be5 SHA512 d0548d2cc2aa4fb4b5ae19d0ff675027370e3ee22d6e1ba448651c6f1f6f5e6b6214c81b760a23954f1e270936248bc021b9594a75191de4c1921e73d1ae48fb WHIRLPOOL 2a8d3d3c6ae37307bd667ab0619f7992f12ad4fb6c2709c2b4ee797b33d6eebee2d0298b7cb1b1a62d6140d3f9563ed7479c508da55234148981e57fe159e842 +DIST lua-5.2.3.tar.gz 251195 SHA256 13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d SHA512 264bb7c8db2f190ef0ca38584ec81999ab588f54e03119c5214c40bb8925b0eb407fac483a03e40cc8a220f6748ddff7d3a7392da3803418276b0d263b866449 WHIRLPOOL d278a1e38416bcf7f82eb3e7fd5fb423e60ccb69e9d57a937070516ff8be2d19a98bbfdaf37ec6fd6fb3ef2d625900977ca0cb47e46cb0ede5ebd5d37a9454ef diff --git a/dev-lang/lua/files/lua-5.2-make-r1.patch b/dev-lang/lua/files/lua-5.2-make-r1.patch new file mode 100644 index 000..a0624af --- /dev/null +++ b/dev-lang/lua/files/lua-5.2-make-r1.patch @@ -0,0 +1,75 @@ +--- lua-5.1.1.orig/Makefile2006-06-02 12:53:38.0 +0200 lua-5.1.1/Makefile 2006-11-16 02:16:53.0 +0100 +@@ -11,7 +11,7 @@ + # so take care if INSTALL_TOP is not an absolute path. + INSTALL_TOP= /usr/local + INSTALL_BIN= $(INSTALL_TOP)/bin +-INSTALL_INC= $(INSTALL_TOP)/include ++INSTALL_INC= $(INSTALL_TOP)/include/lua$V + INSTALL_LIB= $(INSTALL_TOP)/lib + INSTALL_MAN= $(INSTALL_TOP)/man/man1 + # +@@ -127,3 +127,18 @@ + .PHONY: all $(PLATS) clean install local none dummy echo pecho lecho newer + + # (end of Makefile) ++ ++# Use libtool for binary installs, etc. ++ ++export V ++export LIBTOOL = $(EROOT)usr/bin/libtool --quiet --tag=CC ++# See libtool manual about how to set this ++ ++gentoo_clean: ++ cd src; $(MAKE) $@ ++ ++gentoo_install: ++ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) ++ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN) ++ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) ++ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB) +--- lua-5.1.1.orig/src/Makefile2006-03-22 01:41:49.0 +0100 lua-5.1.1/src/Makefile 2006-11-16 02:10:27.0 +0100 +@@ -39,1 +39,1 @@ +-LUA_T=lua ++LUA_T= lua$V +@@ -42,1 +42,1 @@ +-LUAC_T= luac ++LUAC_T= luac$V +@@ -54,1 +54,1 @@ +-$(LUA_T): $(LUA_O) $(LUA_A) ++origin$(LUA_T): $(LUA_O) $(LUA_A) +@@ -57,1 +57,1 @@ +-$(LUAC_T): $(LUAC_O) $(LUA_A) ++origin$(LUAC_T): $(LUAC_O) $(LUA_A) +@@ -185,3 +185,30 @@ + lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \ + lzio.h + ++ ++export LIBTOOL = $(EROOT)usr/bin/libtool --quiet --tag=CC ++export LIB_VERSION = 6:1:1 ++ ++# The following rules use libtool for compiling and linking in order to ++# provide shared library support. ++ ++LIB_NAME = liblua$V.la ++LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) ++ ++%.lo %.o: %.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< ++ ++$(LIB_NAME): $(LIB_OBJS) ++ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \ ++-rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) ++ ++$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME) ++