From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-593690-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 7D6201381F3
for <garchives@archives.gentoo.org>; Mon, 27 May 2013 19:42:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CFEE8E0AE5;
Mon, 27 May 2013 19:42:52 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5C48CE0AE5
for <gentoo-commits@lists.gentoo.org>; Mon, 27 May 2013 19:42:52 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1823D33E0FA
for <gentoo-commits@lists.gentoo.org>; Mon, 27 May 2013 19:42:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 99166E4402
for <gentoo-commits@lists.gentoo.org>; Mon, 27 May 2013 19:42:49 +0000 (UTC)
From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Vadim A. Misbakh-Soloviov" <mva@mva.name>
Message-ID: <1369683749.e665936fc299db6862ab8ecc0842260cc605337a.mva@gentoo>
Subject: [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
X-VCS-Repository: proj/lua
X-VCS-Files: dev-lang/luajit/luajit-2.0.1.ebuild dev-lang/luajit/luajit-9999.ebuild
X-VCS-Directories: dev-lang/luajit/
X-VCS-Committer: mva
X-VCS-Committer-Name: Vadim A. Misbakh-Soloviov
X-VCS-Revision: e665936fc299db6862ab8ecc0842260cc605337a
X-VCS-Branch: master
Date: Mon, 27 May 2013 19:42:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 521b88e1-bc27-44eb-99e3-4b3c2a70c08f
X-Archives-Hash: 26684f479d6d4969597e2c29f5627f18
commit: e665936fc299db6862ab8ecc0842260cc605337a
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Mon May 27 19:42:29 2013 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon May 27 19:42:29 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=e665936f
[dev-lang/luajit] some more ebuild improvements
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/luajit-2.0.1.ebuild | 39 +++++++++++++++++++++----------------
dev-lang/luajit/luajit-9999.ebuild | 39 +++++++++++++++++++++----------------
2 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.1.ebuild b/dev-lang/luajit/luajit-2.0.1.ebuild
index 3859c71..4020f88 100644
--- a/dev-lang/luajit/luajit-2.0.1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.1.ebuild
@@ -23,17 +23,21 @@ PDEPEND="
S="${WORKDIR}/${MY_P}"
-# Workaround for CHECKREQS_MEMORY
-pkg_setup() { :; }
-
-pkg_pretend() {
- CHECKREQS_DISK_BUILD="10M"
- use optimization && {
+check_req() {
+ if use optimization; then
CHECKREQS_MEMORY="200M"
ewarn "Optimized (amalgamated) build wants at least 200MB of RAM"
ewarn "If you have no such RAM - try to disable 'optimization' flag"
- }
- check-reqs_pkg_pretend
+ fi
+ check-reqs_pkg_${1}
+}
+
+pkg_pretend() {
+ check_req pretend
+}
+
+pkg_setup() {
+ check_req setup
}
src_prepare(){
@@ -48,9 +52,11 @@ src_prepare(){
-e "s|lib/|$(get_libdir)/|" \
-i src/luaconf.h || die "failed to fix prefix in luaconf.h"
- use lua52compat && sed \
- -e "/LUAJIT_ENABLE_LUA52COMPAT/s|#||" \
- -i src/Makefile || die
+ if use lua52compat; then
+ sed \
+ -e "/LUAJIT_ENABLE_LUA52COMPAT/s|#||" \
+ -i src/Makefile || die "Lua-5.2 compat fix failed"
+ fi
# removing strip
sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \
@@ -65,6 +71,9 @@ src_prepare(){
}
src_compile() {
+ local opt;
+ use optimization && opt="amalg";
+
if has_version '=sys-devel/gcc-4.7.3' && gcc-specs-pie && has ccache ${FEATURES}; then
# It is three ways to avoid compilation breaking
# in case, when user use gcc-4.7.3+pie+ccache:
@@ -99,11 +108,7 @@ src_compile() {
ewarn "to disable ccache instead."
fi
- if use optimization; then
- emake amalg || die "emake failed!"
- else
- emake || die "emake failed!"
- fi
+ emake "${opt}"
}
src_install() {
@@ -118,7 +123,7 @@ pkg_postinst() {
einfo "You'd probably want to install dev-lua/iluajit to";
ewarn "get fully functional interactive shell for LuaJIT";
fi
- if has_version app-editors/emacs || app-editors/xemacs; then
+ if has_version app-editors/emacs || has_version app-editors/xemacs; then
einfo "You'd probably want to install app-emacs/lua-mode to";
ewarn "get Lua completion in emacs.";
fi
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index 7a8ce47..90a35e4 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -21,17 +21,21 @@ PDEPEND="
virtual/lua[luajit]
"
-# Workaround for CHECKREQS_MEMORY
-pkg_setup() { :; }
-
-pkg_pretend() {
- CHECKREQS_DISK_BUILD="10M"
- use optimization && {
+check_req() {
+ if use optimization; then
CHECKREQS_MEMORY="200M"
ewarn "Optimized (amalgamated) build wants at least 200MB of RAM"
ewarn "If you have no such RAM - try to disable 'optimization' flag"
- }
- check-reqs_pkg_pretend
+ fi
+ check-reqs_pkg_${1}
+}
+
+pkg_pretend() {
+ check_req pretend
+}
+
+pkg_setup() {
+ check_req setup
}
src_prepare(){
@@ -46,9 +50,11 @@ src_prepare(){
-e "s|lib/|$(get_libdir)/|" \
-i src/luaconf.h || die "failed to fix prefix in luaconf.h"
- use lua52compat && sed \
- -e "/LUAJIT_ENABLE_LUA52COMPAT/s|#||" \
- -i src/Makefile || die
+ if use lua52compat; then
+ sed \
+ -e "/LUAJIT_ENABLE_LUA52COMPAT/s|#||" \
+ -i src/Makefile || die "Lua-5.2 compat fix failed"
+ fi
# removing strip
sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \
@@ -61,6 +67,9 @@ src_prepare(){
}
src_compile() {
+ local opt;
+ use optimization && opt="amalg";
+
if has_version '=sys-devel/gcc-4.7.3' && gcc-specs-pie && has ccache ${FEATURES}; then
# It is three ways to avoid compilation breaking
# in case, when user use gcc-4.7.3+pie+ccache:
@@ -95,11 +104,7 @@ src_compile() {
ewarn "to disable ccache instead."
fi
- if use optimization; then
- emake amalg || die "emake failed!"
- else
- emake || die "emake failed!"
- fi
+ emake "${opt}"
}
src_install() {
@@ -114,7 +119,7 @@ pkg_postinst() {
einfo "You'd probably want to install dev-lua/iluajit to";
ewarn "get fully functional interactive shell for LuaJIT";
fi
- if has_version app-editors/emacs || app-editors/xemacs; then
+ if has_version app-editors/emacs || has_version app-editors/xemacs; then
einfo "You'd probably want to install app-emacs/lua-mode to";
ewarn "get Lua completion in emacs.";
fi