| 1 |
commit: 6d6e76fcd87c3eef8a7a5ec7cc46d3a7ae2367e7 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 4 19:32:40 2016 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 4 19:32:40 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6d6e76fc |
| 7 |
|
| 8 |
dev-lang/lua: bring 5.2.1 up to rev 1.4 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20-prefix |
| 11 |
|
| 12 |
dev-lang/lua/lua-5.2.1.ebuild | 37 +++++++++++++++++-------------------- |
| 13 |
1 file changed, 17 insertions(+), 20 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-lang/lua/lua-5.2.1.ebuild b/dev-lang/lua/lua-5.2.1.ebuild |
| 16 |
index 3cafe75..3d01ece 100644 |
| 17 |
--- a/dev-lang/lua/lua-5.2.1.ebuild |
| 18 |
+++ b/dev-lang/lua/lua-5.2.1.ebuild |
| 19 |
@@ -1,6 +1,6 @@ |
| 20 |
-# Copyright 1999-2012 Gentoo Foundation |
| 21 |
+# Copyright 1999-2013 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.1.ebuild,v 1.1 2012/07/04 19:34:20 mabi Exp $ |
| 24 |
+# $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 $ |
| 25 |
|
| 26 |
EAPI=4 |
| 27 |
|
| 28 |
@@ -23,28 +23,14 @@ PDEPEND="emacs? ( app-emacs/lua-mode )" |
| 29 |
src_prepare() { |
| 30 |
local PATCH_PV=$(get_version_component_range 1-2) |
| 31 |
|
| 32 |
- if [[ ${CHOST} == *-winnt* ]]; then |
| 33 |
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-no-libtool.patch |
| 34 |
- else |
| 35 |
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch |
| 36 |
- |
| 37 |
- # Using dynamic linked lua is not recommended for performance |
| 38 |
- # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519 |
| 39 |
- # Mainly, this is of concern if your arch is poor with GPRs, like x86 |
| 40 |
- # Note that this only affects the interpreter binary (named lua), not the lua |
| 41 |
- # compiler (built statically) nor the lua libraries (both shared and static |
| 42 |
- # are installed) |
| 43 |
- if use static ; then |
| 44 |
- sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile |
| 45 |
- fi |
| 46 |
- fi |
| 47 |
+ epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch |
| 48 |
|
| 49 |
[ -d "${FILESDIR}/${PV}" ] && \ |
| 50 |
EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch |
| 51 |
|
| 52 |
sed -i \ |
| 53 |
- -e 's:\(LUA_ROOT\s*\).*:\1"/usr/":' \ |
| 54 |
- -e "s:\(LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \ |
| 55 |
+ -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \ |
| 56 |
+ -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \ |
| 57 |
src/luaconf.h \ |
| 58 |
|| die "failed patching luaconf.h" |
| 59 |
|
| 60 |
@@ -57,6 +43,16 @@ src_prepare() { |
| 61 |
sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h |
| 62 |
fi |
| 63 |
|
| 64 |
+ # Using dynamic linked lua is not recommended for performance |
| 65 |
+ # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519 |
| 66 |
+ # Mainly, this is of concern if your arch is poor with GPRs, like x86 |
| 67 |
+ # Note that this only affects the interpreter binary (named lua), not the lua |
| 68 |
+ # compiler (built statically) nor the lua libraries (both shared and static |
| 69 |
+ # are installed) |
| 70 |
+ if use static ; then |
| 71 |
+ sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile |
| 72 |
+ fi |
| 73 |
+ |
| 74 |
# upstream does not use libtool, but we do (see bug #336167) |
| 75 |
cp "${FILESDIR}/configure.in" "${S}" |
| 76 |
eautoreconf |
| 77 |
@@ -66,7 +62,8 @@ src_compile() { |
| 78 |
tc-export CC |
| 79 |
|
| 80 |
# what to link to liblua |
| 81 |
- liblibs="-lm $(dlopen_lib)" |
| 82 |
+ liblibs="-lm" |
| 83 |
+ liblibs="${liblibs} $(dlopen_lib)" |
| 84 |
|
| 85 |
# what to link to the executables |
| 86 |
mylibs= |
Archives