* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2012-05-09 5:48 Misbakh-Soloviev Vadim A.
0 siblings, 0 replies; 34+ messages in thread
From: Misbakh-Soloviev Vadim A. @ 2012-05-09 5:48 UTC (permalink / raw
To: gentoo-commits
commit: f3c6d2671f989772b9f37dd553ffa813361704e2
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Wed May 9 05:48:16 2012 +0000
Commit: Misbakh-Soloviev Vadim A. <mva <AT> mva <DOT> name>
CommitDate: Wed May 9 05:48:16 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=f3c6d267
Adding dev-lang/lua as build-dependcy
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/luajit-1.1.7.ebuild | 4 +++-
dev-lang/luajit/luajit-2.0.0_beta9.ebuild | 7 +++++--
dev-lang/luajit/luajit-9999.ebuild | 4 +++-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/dev-lang/luajit/luajit-1.1.7.ebuild b/dev-lang/luajit/luajit-1.1.7.ebuild
index 0871ab8..47ee694 100644
--- a/dev-lang/luajit/luajit-1.1.7.ebuild
+++ b/dev-lang/luajit/luajit-1.1.7.ebuild
@@ -17,7 +17,9 @@ SLOT="1"
KEYWORDS="~amd64 ~x86"
IUSE="readline"
-DEPEND="readline? ( sys-libs/readline )
+CDEPEND="dev-lang/lua"
+DEPEND="${CDEPEND}
+ readline? ( sys-libs/readline )
app-admin/eselect-luajit"
RDEPEND="${DEPEND}"
diff --git a/dev-lang/luajit/luajit-2.0.0_beta9.ebuild b/dev-lang/luajit/luajit-2.0.0_beta9.ebuild
index 39e94dd..07e9bb2 100644
--- a/dev-lang/luajit/luajit-2.0.0_beta9.ebuild
+++ b/dev-lang/luajit/luajit-2.0.0_beta9.ebuild
@@ -17,7 +17,10 @@ SLOT="2"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="app-admin/eselect-luajit"
+CDEPEND="dev-lang/lua"
+DEPEND="${CDEPEND}
+ app-admin/eselect-luajit"
+
S="${WORKDIR}/${MY_P}"
src_prepare(){
@@ -45,4 +48,4 @@ pkg_postinst() {
ewarn "Now you should select LuaJIT version to use as system default LuaJIT interpreter."
ewarn "Use 'eselect luajit list' to look for installed versions and"
ewarn "Use 'eselect luajit set <NUMBER_or_NAME>' to set version you chose."
-}
\ No newline at end of file
+}
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index 9acb9c2..9370e95 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -16,7 +16,9 @@ SLOT="2"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="app-admin/eselect-luajit"
+CDEPEND="dev-lang/lua"
+DEPEND="${CDEPEND}
+ app-admin/eselect-luajit"
src_prepare(){
# fixing prefix and version
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2012-07-12 22:46 Misbakh-Soloviev Vadim A.
0 siblings, 0 replies; 34+ messages in thread
From: Misbakh-Soloviev Vadim A. @ 2012-07-12 22:46 UTC (permalink / raw
To: gentoo-commits
commit: eec2ea011bf4c5cc94b5842fe48fd661a9a5d7e7
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Thu Jul 12 22:46:22 2012 +0000
Commit: Misbakh-Soloviev Vadim A. <mva <AT> mva <DOT> name>
CommitDate: Thu Jul 12 22:46:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=eec2ea01
LuaJIT fixes
---
dev-lang/luajit/luajit-9999.ebuild | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index 5c9d098..68ae749 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -14,11 +14,12 @@ EGIT_REPO_URI="http://luajit.org/git/luajit-2.0.git"
LICENSE="MIT"
SLOT="2"
KEYWORDS=""
-IUSE="symlink +optimization"
+IUSE="emacs +optimization symlink"
CDEPEND=" symlink? ( dev-lang/lua-headers !dev-lang/lua )
!symlink? ( dev-lang/lua )"
DEPEND="${CDEPEND}
+ emacs? ( app-emacs/lua-mode )
app-admin/eselect-luajit"
# Workaround for CHECKREQS_MEMORY
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2012-07-13 1:55 Misbakh-Soloviev Vadim A.
0 siblings, 0 replies; 34+ messages in thread
From: Misbakh-Soloviev Vadim A. @ 2012-07-13 1:55 UTC (permalink / raw
To: gentoo-commits
commit: 67b9a87908bd69f641e9aec1bca5eb630bbef976
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Fri Jul 13 01:55:53 2012 +0000
Commit: Misbakh-Soloviev Vadim A. <mva <AT> mva <DOT> name>
CommitDate: Fri Jul 13 01:55:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=67b9a879
luajit fix
---
dev-lang/luajit/luajit-9999.ebuild | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index 68ae749..d1e9f10 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -16,8 +16,8 @@ SLOT="2"
KEYWORDS=""
IUSE="emacs +optimization symlink"
-CDEPEND=" symlink? ( dev-lang/lua-headers !dev-lang/lua )
- !symlink? ( dev-lang/lua )"
+CDEPEND=" symlink? ( =dev-lang/lua-headers-5.1* !dev-lang/lua )
+ !symlink? ( =dev-lang/lua-5.1* )"
DEPEND="${CDEPEND}
emacs? ( app-emacs/lua-mode )
app-admin/eselect-luajit"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2012-07-13 2:31 Misbakh-Soloviev Vadim A.
0 siblings, 0 replies; 34+ messages in thread
From: Misbakh-Soloviev Vadim A. @ 2012-07-13 2:31 UTC (permalink / raw
To: gentoo-commits
commit: 369ebd31c88642742e0f1e075ba2c79413921214
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Fri Jul 13 02:31:20 2012 +0000
Commit: Misbakh-Soloviev Vadim A. <mva <AT> mva <DOT> name>
CommitDate: Fri Jul 13 02:31:20 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=369ebd31
fix luajit deps
---
dev-lang/luajit/luajit-2.0.0_beta10.ebuild | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.0_beta10.ebuild b/dev-lang/luajit/luajit-2.0.0_beta10.ebuild
index 9173008..3dc5395 100644
--- a/dev-lang/luajit/luajit-2.0.0_beta10.ebuild
+++ b/dev-lang/luajit/luajit-2.0.0_beta10.ebuild
@@ -17,8 +17,8 @@ LICENSE="MIT"
SLOT="2"
IUSE="emacs +optimization symlink"
-CDEPEND=" symlink? ( dev-lang/lua-headers !dev-lang/lua )
- !symlink? ( dev-lang/lua )"
+CDEPEND=" symlink? ( =dev-lang/lua-headers-5.1* !dev-lang/lua )
+ !symlink? ( =dev-lang/lua-5.1* )"
DEPEND="${CDEPEND}
emacs? ( app-emacs/lua-mode )
app-admin/eselect-luajit"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2012-07-13 18:27 Misbakh-Soloviev Vadim A.
0 siblings, 0 replies; 34+ messages in thread
From: Misbakh-Soloviev Vadim A. @ 2012-07-13 18:27 UTC (permalink / raw
To: gentoo-commits
commit: 03a47562bb61aba547a8bb789af91373fe8cbf58
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Fri Jul 13 18:25:38 2012 +0000
Commit: Misbakh-Soloviev Vadim A. <mva <AT> mva <DOT> name>
CommitDate: Fri Jul 13 18:25:38 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=03a47562
luajit ebuild update
---
dev-lang/luajit/luajit-2.0.0_beta10.ebuild | 1 +
dev-lang/luajit/luajit-9999.ebuild | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.0_beta10.ebuild b/dev-lang/luajit/luajit-2.0.0_beta10.ebuild
index 3dc5395..dfea895 100644
--- a/dev-lang/luajit/luajit-2.0.0_beta10.ebuild
+++ b/dev-lang/luajit/luajit-2.0.0_beta10.ebuild
@@ -75,6 +75,7 @@ src_install() {
dosym liblua.so.5.1.9999 /usr/$(get_libdir)/liblua.so.5
dosym libluajit-5.1.so /usr/$(get_libdir)/liblua.so.5.1.9999
dosym libluajit-5.1.a /usr/$(get_libdir)/liblua.a
+ dosym luajit.pc /usr/$(get_libdir)/pkgconfig/lua.pc
}
}
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index d1e9f10..15e6f1d 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -72,6 +72,7 @@ src_install() {
dosym liblua.so.5.1.9999 /usr/$(get_libdir)/liblua.so.5
dosym libluajit-5.1.so /usr/$(get_libdir)/liblua.so.5.1.9999
dosym libluajit-5.1.a /usr/$(get_libdir)/liblua.a
+ dosym luajit.pc /usr/$(get_libdir)/pkgconfig/lua.pc
}
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2012-08-08 12:32 Misbakh-Soloviev Vadim A.
0 siblings, 0 replies; 34+ messages in thread
From: Misbakh-Soloviev Vadim A. @ 2012-08-08 12:32 UTC (permalink / raw
To: gentoo-commits
commit: 480a446b2b9d32fb4caa3e4a59d9bed432172bfd
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Wed Aug 8 12:32:15 2012 +0000
Commit: Misbakh-Soloviev Vadim A. <mva <AT> mva <DOT> name>
CommitDate: Wed Aug 8 12:32:15 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=480a446b
fix luajit
---
dev-lang/luajit/luajit-9999.ebuild | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index 15e6f1d..af84695 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -50,6 +50,9 @@ src_prepare(){
# removing strip
sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \
|| die "failed to remove forced strip"
+ sed -r
+ -e 's#(INSTALL_CMOD=.*)#\1\nINSTALL_INC=${includedir}#'
+ -i etc/luajit.pc || die "failed to fix pkg-config file"
}
src_compile() {
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2012-08-08 12:39 Misbakh-Soloviev Vadim A.
0 siblings, 0 replies; 34+ messages in thread
From: Misbakh-Soloviev Vadim A. @ 2012-08-08 12:39 UTC (permalink / raw
To: gentoo-commits
commit: 3fe9e34ace29d7a8ae4d189720563032eaa1f8d5
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Wed Aug 8 12:40:00 2012 +0000
Commit: Misbakh-Soloviev Vadim A. <mva <AT> mva <DOT> name>
CommitDate: Wed Aug 8 12:40:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=3fe9e34a
missing newline escaping
---
dev-lang/luajit/luajit-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index af84695..521c1bc 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -51,7 +51,7 @@ src_prepare(){
sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \
|| die "failed to remove forced strip"
sed -r
- -e 's#(INSTALL_CMOD=.*)#\1\nINSTALL_INC=${includedir}#'
+ -e 's#(INSTALL_CMOD=.*)#\1\nINSTALL_INC=${includedir}#' \
-i etc/luajit.pc || die "failed to fix pkg-config file"
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2012-08-08 13:01 Misbakh-Soloviev Vadim A.
0 siblings, 0 replies; 34+ messages in thread
From: Misbakh-Soloviev Vadim A. @ 2012-08-08 13:01 UTC (permalink / raw
To: gentoo-commits
commit: 35ba8cf7a4de323c3821ca39c6c633de2989ef0e
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Wed Aug 8 13:01:47 2012 +0000
Commit: Misbakh-Soloviev Vadim A. <mva <AT> mva <DOT> name>
CommitDate: Wed Aug 8 13:01:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=35ba8cf7
Sorry. One more missed slash
---
dev-lang/luajit/luajit-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index 521c1bc..c515305 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -50,7 +50,7 @@ src_prepare(){
# removing strip
sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \
|| die "failed to remove forced strip"
- sed -r
+ sed -r \
-e 's#(INSTALL_CMOD=.*)#\1\nINSTALL_INC=${includedir}#' \
-i etc/luajit.pc || die "failed to fix pkg-config file"
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2012-08-08 20:38 Misbakh-Soloviev Vadim A.
0 siblings, 0 replies; 34+ messages in thread
From: Misbakh-Soloviev Vadim A. @ 2012-08-08 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 96e1820cf01fd2cde4ea635c0829bcd353da43a7
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Wed Aug 8 20:38:16 2012 +0000
Commit: Misbakh-Soloviev Vadim A. <mva <AT> mva <DOT> name>
CommitDate: Wed Aug 8 20:38:16 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=96e1820c
merging luajit fix to snapshot version
---
dev-lang/luajit/luajit-2.0.0_beta10.ebuild | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.0_beta10.ebuild b/dev-lang/luajit/luajit-2.0.0_beta10.ebuild
index dfea895..ff75757 100644
--- a/dev-lang/luajit/luajit-2.0.0_beta10.ebuild
+++ b/dev-lang/luajit/luajit-2.0.0_beta10.ebuild
@@ -53,6 +53,9 @@ src_prepare(){
# removing strip
sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \
|| die "failed to remove forced strip"
+ sed -r \
+ -e 's#(INSTALL_CMOD=.*)#\1\nINSTALL_INC=${includedir}#' \
+ -i etc/luajit.pc || die "failed to fix pkg-config file"
}
src_compile() {
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2013-03-19 7:31 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-03-19 7:31 UTC (permalink / raw
To: gentoo-commits
commit: 059db56026daf1e0e3992bdf6bf7df7b9cc251c3
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Tue Mar 19 07:31:47 2013 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Tue Mar 19 07:31:47 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=059db560
[dev-lang/luajit] fix in luac erapper path
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/luajit-2.0.1.ebuild | 2 +-
dev-lang/luajit/luajit-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.1.ebuild b/dev-lang/luajit/luajit-2.0.1.ebuild
index 2e10478..f8b2dc7 100644
--- a/dev-lang/luajit/luajit-2.0.1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.1.ebuild
@@ -78,7 +78,7 @@ src_install() {
einstall DESTDIR="${D}"
pax-mark m "${D}usr/bin/${P}"
dosym "luajit-${PV}" "/usr/bin/${PN}"
- dobin "${FILESDIR}/${P}-luac-wrapper"
+ newbin "${FILESDIR}/luac.jit" "${P}-luac-wrapper"
}
#pkg_postinst() {
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index 5f1d49e..3b54dea 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -73,7 +73,7 @@ src_install() {
einstall DESTDIR="${D}"
pax-mark m "${D}usr/bin/${P}"
dosym "luajit-${PV}" "/usr/bin/${PN}"
- dobin "${FILESDIR}/${P}-luac-wrapper"
+ newbin "${FILESDIR}/luac.jit" "${P}-luac-wrapper"
}
#pkg_postinst() {
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2013-05-10 8:53 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-05-10 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 59e604e2498e9ca1e05c7cf4ac25b3a3192f222a
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Fri May 10 08:53:56 2013 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Fri May 10 08:53:56 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=59e604e2
[dev-lang/luajit] fixed deps
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/luajit-2.0.1.ebuild | 2 +-
dev-lang/luajit/luajit-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.1.ebuild b/dev-lang/luajit/luajit-2.0.1.ebuild
index afd33aa..0a4d5f1 100644
--- a/dev-lang/luajit/luajit-2.0.1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.1.ebuild
@@ -18,7 +18,7 @@ SLOT="2"
IUSE="emacs +optimization +interactive"
CDEPEND="
- || ( dev-lang/lua-headers dev-lang/lua )
+ || ( =dev-lang/lua-headers-5.1* dev-lang/lua )
"
DEPEND="
${CDEPEND}
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index b1ad54e..ada39f4 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
IUSE="emacs +optimization +interactive"
CDEPEND="
- || ( dev-lang/lua-headers dev-lang/lua )
+ || ( =dev-lang/lua-headers-5.1* dev-lang/lua )
"
DEPEND="
${CDEPEND}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2013-05-26 8:31 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-05-26 8:31 UTC (permalink / raw
To: gentoo-commits
commit: 9ab766952b7edf07d57152978ec1bdb345d73b50
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Sun May 26 07:30:08 2013 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sun May 26 07:30:08 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=9ab76695
[dev-lang/luajit] luaheaders is unneded
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/luajit-2.0.1.ebuild | 6 +++---
dev-lang/luajit/luajit-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.1.ebuild b/dev-lang/luajit/luajit-2.0.1.ebuild
index 0a4d5f1..2c71761 100644
--- a/dev-lang/luajit/luajit-2.0.1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.1.ebuild
@@ -17,9 +17,9 @@ LICENSE="MIT"
SLOT="2"
IUSE="emacs +optimization +interactive"
-CDEPEND="
- || ( =dev-lang/lua-headers-5.1* dev-lang/lua )
-"
+#CDEPEND="
+# || ( =dev-lang/lua-headers-5.1* dev-lang/lua )
+#"
DEPEND="
${CDEPEND}
emacs? ( app-emacs/lua-mode )
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index ada39f4..dfeaf1c 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -16,9 +16,9 @@ SLOT="2"
KEYWORDS=""
IUSE="emacs +optimization +interactive"
-CDEPEND="
- || ( =dev-lang/lua-headers-5.1* dev-lang/lua )
-"
+#CDEPEND="
+# || ( =dev-lang/lua-headers-5.1* dev-lang/lua )
+#"
DEPEND="
${CDEPEND}
emacs? ( app-emacs/lua-mode )
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2013-05-26 22:01 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-05-26 22:01 UTC (permalink / raw
To: gentoo-commits
commit: e56daa8f6ad249645ad73ed48d8e04b13b883fec
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Sun May 26 22:01:41 2013 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sun May 26 22:01:41 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=e56daa8f
[dev-lang/luajit] added lua52compat useflag + rare-case compilation failure fix
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/luajit-2.0.1.ebuild | 43 ++++++++++++++++++++++++++++++---
dev-lang/luajit/luajit-9999.ebuild | 45 +++++++++++++++++++++++++++++++----
2 files changed, 79 insertions(+), 9 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.1.ebuild b/dev-lang/luajit/luajit-2.0.1.ebuild
index 2c71761..fe44275 100644
--- a/dev-lang/luajit/luajit-2.0.1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.1.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit eutils multilib check-reqs pax-utils
+inherit eutils multilib flag-o-matic check-reqs pax-utils
MY_P="LuaJIT-${PV/_/-}"
DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
@@ -17,9 +17,6 @@ LICENSE="MIT"
SLOT="2"
IUSE="emacs +optimization +interactive"
-#CDEPEND="
-# || ( =dev-lang/lua-headers-5.1* dev-lang/lua )
-#"
DEPEND="
${CDEPEND}
emacs? ( app-emacs/lua-mode )
@@ -56,6 +53,10 @@ 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
+
# removing strip
sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \
|| die "failed to remove forced strip"
@@ -67,6 +68,40 @@ src_prepare(){
}
src_compile() {
+ 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:
+ # a) append -fPIC to CFLAGS, to use it even for temporary
+ # build-time only static host/* bins and luajit binary itself.
+ # b) append -nopie to LDFLAGS
+ # (for same binaries and same reason)
+ # c) disable ccache (even in per-package basis).
+ # This will slow down amalgamated build, but is prefered and
+ # recommended by upstream method.
+ # So, since it is impossible to use method "c" directly from
+ # ebuild, I choose method "a"
+ # (since it is more secure on hardened systems, imho) +
+ # + ewarn user, that he really should disable ccache.
+
+# append-ldflags -nopie
+ append-cflags -fPIC
+ ewarn "As we detected, that you're using gcc-4.7.3+pie+ccache,"
+ ewarn "we need to either:"
+ ewarn " a) add -fPIC to CFLAGS, or"
+ ewarn " b) add -nopie to LDFLAGS, or"
+ ewarn " c) disable ccache (even on per-package basis)."
+ ewarn ""
+ ewarn "We suggest you to use variant 'c' and disable it via"
+ ewarn "/etc/portage/{,package.}env (read portage manual)"
+ ewarn ""
+ ewarn "But, since we can't do that from ebuild, we'll continue"
+ ewarn "with -fPIC (variant 'a') for now, since it gives more security"
+ ewarn "on hardened systems (in our opinion)."
+ ewarn ""
+ ewarn "But, anyway, we still *HIGHLY* recommend you"
+ ewarn "to disable ccache instead."
+ fi
+
if use optimization; then
emake amalg || die "emake failed!"
else
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index dfeaf1c..bda8a63 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit eutils multilib check-reqs pax-utils git-2
+inherit eutils multilib flag-o-matic check-reqs pax-utils git-2
DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
HOMEPAGE="http://luajit.org/"
@@ -14,11 +14,8 @@ EGIT_REPO_URI="http://luajit.org/git/luajit-2.0.git"
LICENSE="MIT"
SLOT="2"
KEYWORDS=""
-IUSE="emacs +optimization +interactive"
+IUSE="emacs +optimization +interactive lua52compat"
-#CDEPEND="
-# || ( =dev-lang/lua-headers-5.1* dev-lang/lua )
-#"
DEPEND="
${CDEPEND}
emacs? ( app-emacs/lua-mode )
@@ -53,6 +50,10 @@ 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
+
# removing strip
sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \
|| die "failed to remove forced strip"
@@ -62,6 +63,40 @@ src_prepare(){
}
src_compile() {
+ 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:
+ # a) append -fPIC to CFLAGS, to use it even for temporary
+ # build-time only static host/* bins and luajit binary itself.
+ # b) append -nopie to LDFLAGS
+ # (for same binaries and same reason)
+ # c) disable ccache (even in per-package basis).
+ # This will slow down amalgamated build, but is prefered and
+ # recommended by upstream method.
+ # So, since it is impossible to use method "c" directly from
+ # ebuild, I choose method "a"
+ # (since it is more secure on hardened systems, imho) +
+ # + ewarn user, that he really should disable ccache.
+
+# append-ldflags -nopie
+ append-cflags -fPIC
+ ewarn "As we detected, that you're using gcc-4.7.3+pie+ccache,"
+ ewarn "we need to either:"
+ ewarn " a) add -fPIC to CFLAGS, or"
+ ewarn " b) add -nopie to LDFLAGS, or"
+ ewarn " c) disable ccache (even on per-package basis)."
+ ewarn ""
+ ewarn "We suggest you to use variant 'c' and disable it via"
+ ewarn "/etc/portage/{,package.}env (read portage manual)"
+ ewarn ""
+ ewarn "But, since we can't do that from ebuild, we'll continue"
+ ewarn "with -fPIC (variant 'a') for now, since it gives more security"
+ ewarn "on hardened systems (in our opinion)."
+ ewarn ""
+ ewarn "But, anyway, we still *HIGHLY* recommend you"
+ ewarn "to disable ccache instead."
+ fi
+
if use optimization; then
emake amalg || die "emake failed!"
else
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2013-05-27 7:52 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-05-27 7:52 UTC (permalink / raw
To: gentoo-commits
commit: b0686936da2597586ae8d4736a2f7d47ad78b46c
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Mon May 27 07:51:49 2013 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon May 27 07:51:49 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=b0686936
[dev-lang/luajit] added missing lua52compat useflag for tarballed ebuild
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/luajit-2.0.1.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.1.ebuild b/dev-lang/luajit/luajit-2.0.1.ebuild
index fe44275..bc70ec7 100644
--- a/dev-lang/luajit/luajit-2.0.1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
LICENSE="MIT"
SLOT="2"
-IUSE="emacs +optimization +interactive"
+IUSE="emacs +optimization +interactive lua52compat"
DEPEND="
${CDEPEND}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2013-05-27 18:35 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-05-27 18:35 UTC (permalink / raw
To: gentoo-commits
commit: b7ea6074128d4f88b4f701fb6fd997328819aaab
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Mon May 27 18:34:54 2013 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon May 27 18:34:54 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=b7ea6074
[dev-lang/luajit] rafaelmartins+devmalual inspired fixes
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/luajit-2.0.1.ebuild | 25 ++++++++++++++-----------
dev-lang/luajit/luajit-9999.ebuild | 19 +++++++++++++------
2 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.1.ebuild b/dev-lang/luajit/luajit-2.0.1.ebuild
index bc70ec7..76b6748 100644
--- a/dev-lang/luajit/luajit-2.0.1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.1.ebuild
@@ -6,28 +6,22 @@ EAPI="5"
inherit eutils multilib flag-o-matic check-reqs pax-utils
-MY_P="LuaJIT-${PV/_/-}"
DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
HOMEPAGE="http://luajit.org/"
SRC_URI="http://luajit.org/download/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
LICENSE="MIT"
SLOT="2"
-IUSE="emacs +optimization +interactive lua52compat"
+KEYWORDS="~amd64 ~x86"
+IUSE="+optimization lua52compat"
DEPEND="
${CDEPEND}
- emacs? ( app-emacs/lua-mode )
"
PDEPEND="
- interactive? ( dev-lua/iluajit )
virtual/lua[luajit]
"
-S="${WORKDIR}/${MY_P}"
-
# Workaround for CHECKREQS_MEMORY
pkg_setup() { :; }
@@ -60,6 +54,8 @@ src_prepare(){
# removing strip
sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \
|| die "failed to remove forced strip"
+
+ # fixing pkg-config file (Lua-replacing compatibility)
sed -r \
-e 's#(INSTALL_CMOD=.*)#\1\nINSTALL_INC=${includedir}#' \
-i etc/luajit.pc || die "failed to fix pkgconfig file"
@@ -116,6 +112,13 @@ src_install() {
newbin "${FILESDIR}/luac.jit" "luac-${P}"
}
-#pkg_postinst() {
-# "${ROOT}"/usr/bin/eselect lua set "${P}"
-#}
\ No newline at end of file
+pkg_postinst() {
+ if ! has_version dev-lua/iluajit; then
+ 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
+ einfo "You'd probably want to install app-emacs/lua-mode to";
+ ewarn "get Lua completion in emacs.";
+ fi
+}
\ No newline at end of file
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index bda8a63..1d66621 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -14,14 +14,12 @@ EGIT_REPO_URI="http://luajit.org/git/luajit-2.0.git"
LICENSE="MIT"
SLOT="2"
KEYWORDS=""
-IUSE="emacs +optimization +interactive lua52compat"
+IUSE="+optimization lua52compat"
DEPEND="
${CDEPEND}
- emacs? ( app-emacs/lua-mode )
"
PDEPEND="
- interactive? ( dev-lua/iluajit )
virtual/lua[luajit]
"
@@ -57,6 +55,8 @@ src_prepare(){
# removing strip
sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \
|| die "failed to remove forced strip"
+
+ # fixing pkg-config file (Lua-replacing compatibility)
sed -r \
-e 's#(INSTALL_CMOD=.*)#\1\nINSTALL_INC=${includedir}#' \
-i etc/luajit.pc || die "failed to fix pkgconfig file"
@@ -111,6 +111,13 @@ src_install() {
newbin "${FILESDIR}/luac.jit" "luac-${P}"
}
-#pkg_postinst() {
-# "${ROOT}"/usr/bin/eselect lua set "${P}"
-#}
+pkg_postinst() {
+ if ! has_version dev-lua/iluajit; then
+ 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
+ einfo "You'd probably want to install app-emacs/lua-mode to";
+ ewarn "get Lua completion in emacs.";
+ fi
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2013-05-27 18:49 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-05-27 18:49 UTC (permalink / raw
To: gentoo-commits
commit: 5d92eb7e8ded653a94982717cd377c597b4a8fae
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Mon May 27 18:49:20 2013 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon May 27 18:49:20 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=5d92eb7e
[dev-lang/luajit] restoring accidentally missed MY_P from 2.0.1 + wiping out CDEPEND
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/luajit-2.0.1.ebuild | 7 ++++---
dev-lang/luajit/luajit-9999.ebuild | 4 +---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.1.ebuild b/dev-lang/luajit/luajit-2.0.1.ebuild
index 76b6748..3859c71 100644
--- a/dev-lang/luajit/luajit-2.0.1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.1.ebuild
@@ -6,6 +6,7 @@ EAPI="5"
inherit eutils multilib flag-o-matic check-reqs pax-utils
+MY_P="LuaJIT-${PV/_/-}"
DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
HOMEPAGE="http://luajit.org/"
SRC_URI="http://luajit.org/download/${MY_P}.tar.gz"
@@ -15,13 +16,13 @@ SLOT="2"
KEYWORDS="~amd64 ~x86"
IUSE="+optimization lua52compat"
-DEPEND="
- ${CDEPEND}
-"
+DEPEND=""
PDEPEND="
virtual/lua[luajit]
"
+S="${WORKDIR}/${MY_P}"
+
# Workaround for CHECKREQS_MEMORY
pkg_setup() { :; }
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index 1d66621..7a8ce47 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -16,9 +16,7 @@ SLOT="2"
KEYWORDS=""
IUSE="+optimization lua52compat"
-DEPEND="
- ${CDEPEND}
-"
+DEPEND=""
PDEPEND="
virtual/lua[luajit]
"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2013-05-27 19:42 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-05-27 19:42 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2013-05-27 20:30 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-05-27 20:30 UTC (permalink / raw
To: gentoo-commits
commit: 081ff4477712a1a93fba41783c98985c4359d93c
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Mon May 27 20:30:24 2013 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon May 27 20:30:24 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=081ff447
[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 | 8 ++++----
dev-lang/luajit/luajit-9999.ebuild | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.1.ebuild b/dev-lang/luajit/luajit-2.0.1.ebuild
index 4020f88..0b14d62 100644
--- a/dev-lang/luajit/luajit-2.0.1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.1.ebuild
@@ -28,8 +28,8 @@ check_req() {
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_${1}
fi
- check-reqs_pkg_${1}
}
pkg_pretend() {
@@ -74,7 +74,7 @@ src_compile() {
local opt;
use optimization && opt="amalg";
- if has_version '=sys-devel/gcc-4.7.3' && gcc-specs-pie && has ccache ${FEATURES}; then
+ if gcc-fullversion 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:
# a) append -fPIC to CFLAGS, to use it even for temporary
@@ -112,8 +112,8 @@ src_compile() {
}
src_install() {
- einstall DESTDIR="${D}"
- pax-mark m "${D}usr/bin/${P}"
+ default
+ host-is-pax && pax-mark m "${D}usr/bin/${P}"
dosym "luajit-${PV}" "/usr/bin/${PN}"
newbin "${FILESDIR}/luac.jit" "luac-${P}"
}
diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index 90a35e4..08f52e0 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -26,8 +26,8 @@ check_req() {
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_${1}
fi
- check-reqs_pkg_${1}
}
pkg_pretend() {
@@ -70,7 +70,7 @@ src_compile() {
local opt;
use optimization && opt="amalg";
- if has_version '=sys-devel/gcc-4.7.3' && gcc-specs-pie && has ccache ${FEATURES}; then
+ if gcc-fullversion 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:
# a) append -fPIC to CFLAGS, to use it even for temporary
@@ -108,8 +108,8 @@ src_compile() {
}
src_install() {
- einstall DESTDIR="${D}"
- pax-mark m "${D}usr/bin/${P}"
+ default
+ host-is-pax && pax-mark m "${D}usr/bin/${P}"
dosym "luajit-${PV}" "/usr/bin/${PN}"
newbin "${FILESDIR}/luac.jit" "luac-${P}"
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2013-12-18 11:58 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-12-18 11:58 UTC (permalink / raw
To: gentoo-commits
commit: 95051a80ad6361a301be80c897bbeeafc7fc6e39
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Wed Dec 18 11:58:13 2013 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Wed Dec 18 11:58:13 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=95051a80
[dev-lang/luajit] fixed libdir
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/luajit-2.0.9999.ebuild | 2 +-
dev-lang/luajit/luajit-2.1.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index 983bd22..bd05797 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -56,7 +56,7 @@ src_prepare(){
sed \
-e "s|/usr/local|/usr|" \
- -e "s|lib/|$(get_libdir)/|" \
+ -e "s|=lib|=$(get_libdir)|" \
-i etc/luajit.pc || die "failed to fix prefix in pkg-config file"
}
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index 6950777..33c18d7 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -56,7 +56,7 @@ src_prepare(){
sed \
-e "s|/usr/local|/usr|" \
- -e "s|lib/|$(get_libdir)/|" \
+ -e "s|=lib|=$(get_libdir)|" \
-i etc/luajit.pc || die "failed to fix prefix in pkg-config file"
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2013-12-18 18:27 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-12-18 18:27 UTC (permalink / raw
To: gentoo-commits
commit: a0100a92ec7b8cfab371184c0f47cf365df6c660
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Wed Dec 18 18:27:18 2013 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Wed Dec 18 18:27:18 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=a0100a92
[dev-lang/luajit] fixed build
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/luajit-2.0.9999.ebuild | 18 ++++--------------
dev-lang/luajit/luajit-2.1.9999.ebuild | 18 ++++--------------
2 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index bd05797..34c3fe6 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -11,7 +11,7 @@ MY_PV="2.0.1"
DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
HOMEPAGE="http://luajit.org/"
SRC_URI=""
-EGIT_REPO_URI="http://luajit.org/git/luajit-2.0.git"
+EGIT_REPO_URI="git://repo.or.cz/luajit-2.0.git"
LICENSE="MIT"
SLOT="2"
@@ -44,20 +44,10 @@ pkg_setup() {
src_prepare(){
# fixing prefix and version
- sed \
- -e "s|/usr/local|/usr|" \
- -e "s|/lib|/$(get_libdir)|" \
+ sed -r \
+ -e "s|( PREFIX)=.*|\1=/usr|" \
+ -e "s|( MULTILIB)=.*|\1=$(get_libdir)|" \
-i Makefile || die "failed to fix prefix in Makefile"
-
- sed \
- -e "s|/usr/local|/usr|" \
- -e "s|lib/|$(get_libdir)/|" \
- -i src/luaconf.h || die "failed to fix prefix in luaconf.h"
-
- sed \
- -e "s|/usr/local|/usr|" \
- -e "s|=lib|=$(get_libdir)|" \
- -i etc/luajit.pc || die "failed to fix prefix in pkg-config file"
}
src_compile() {
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index 33c18d7..83a3cc5 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -11,7 +11,7 @@ MY_PV="2.1.0-alpha"
DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
HOMEPAGE="http://luajit.org/"
SRC_URI=""
-EGIT_REPO_URI="http://luajit.org/git/luajit-2.0.git"
+EGIT_REPO_URI="git://repo.or.cz/luajit-2.0.git"
EGIT_BRANCH="v2.1"
LICENSE="MIT"
@@ -44,20 +44,10 @@ pkg_setup() {
src_prepare(){
# fixing prefix and version
- sed \
- -e "s|/usr/local|/usr|" \
- -e "s|/lib|/$(get_libdir)|" \
+ sed -r \
+ -e "s|( PREFIX)=.*|\1=/usr|" \
+ -e "s|( MULTILIB)=.*|\1=$(get_libdir)|" \
-i Makefile || die "failed to fix prefix in Makefile"
-
- sed \
- -e "s|/usr/local|/usr|" \
- -e "s|lib/|$(get_libdir)/|" \
- -i src/luaconf.h || die "failed to fix prefix in luaconf.h"
-
- sed \
- -e "s|/usr/local|/usr|" \
- -e "s|=lib|=$(get_libdir)|" \
- -i etc/luajit.pc || die "failed to fix prefix in pkg-config file"
}
src_compile() {
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2013-12-29 12:13 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-12-29 12:13 UTC (permalink / raw
To: gentoo-commits
commit: e553071589f97101c2dda53d5b48c7edfb83593d
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Sun Dec 29 12:13:43 2013 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sun Dec 29 12:13:43 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=e5530715
[dev-lang/luajit] bump
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/luajit-2.0.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index 34c3fe6..871668e 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
inherit base multilib pax-utils versionator toolchain-funcs flag-o-matic check-reqs git-r3
-MY_PV="2.0.1"
+MY_PV="2.0.2"
DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
HOMEPAGE="http://luajit.org/"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2014-01-21 20:15 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2014-01-21 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 0b6b41852683587a381893babacfcbee61f2e871
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Tue Jan 21 20:07:38 2014 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Tue Jan 21 20:09:14 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=0b6b4185
[dev-lang/luajit] aded USE=debug
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/luajit-2.0.2.ebuild | 16 +++++++++++-----
dev-lang/luajit/luajit-2.0.9999.ebuild | 7 ++++++-
dev-lang/luajit/luajit-2.1.9999.ebuild | 8 +++++++-
3 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.2.ebuild b/dev-lang/luajit/luajit-2.0.2.ebuild
index 4662414..30252a5 100644
--- a/dev-lang/luajit/luajit-2.0.2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="2"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="lua52compat +optimization"
+IUSE="debug lua52compat +optimization"
DEPEND=""
PDEPEND="
@@ -67,10 +67,16 @@ src_prepare() {
-e "s|lib/|$(get_libdir)/|" \
-i src/luaconf.h || die "failed to fix prefix in luaconf.h"
- sed \
- -e "s|/usr/local|/usr|" \
- -e "s|lib/|$(get_libdir)/|" \
- -i etc/luajit.pc || die "failed to fix prefix in pkg-config file"
+ sed \
+ -e "s|/usr/local|/usr|" \
+ -e "s|lib/|$(get_libdir)/|" \
+ -i etc/luajit.pc || die "failed to fix prefix in pkg-config file"
+
+ use debug && (
+ sed -r \
+ -e 's/#(CCDEBUG= -g)/\1 -ggdb/' \
+ -i src/Makefile || die "Failed to enable debug"
+ )
}
src_compile() {
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index 871668e..f977eea 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -16,7 +16,7 @@ EGIT_REPO_URI="git://repo.or.cz/luajit-2.0.git"
LICENSE="MIT"
SLOT="2"
KEYWORDS=""
-IUSE="lua52compat +optimization"
+IUSE="debug lua52compat +optimization"
DEPEND=""
PDEPEND="
@@ -48,6 +48,11 @@ src_prepare(){
-e "s|( PREFIX)=.*|\1=/usr|" \
-e "s|( MULTILIB)=.*|\1=$(get_libdir)|" \
-i Makefile || die "failed to fix prefix in Makefile"
+ use debug && (
+ sed -r \
+ -e 's/#(CCDEBUG= -g)/\1 -ggdb/' \
+ -i src/Makefile || die "Failed to enable debug"
+ )
}
src_compile() {
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index 83a3cc5..1898ded 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -17,7 +17,7 @@ EGIT_BRANCH="v2.1"
LICENSE="MIT"
SLOT="2"
KEYWORDS=""
-IUSE="lua52compat +optimization"
+IUSE="debug lua52compat +optimization"
PDEPEND="
virtual/lua[luajit]
@@ -48,6 +48,12 @@ src_prepare(){
-e "s|( PREFIX)=.*|\1=/usr|" \
-e "s|( MULTILIB)=.*|\1=$(get_libdir)|" \
-i Makefile || die "failed to fix prefix in Makefile"
+
+ use debug && (
+ sed -r \
+ -e 's/#(CCDEBUG= -g)/\1 -ggdb/' \
+ -i src/Makefile || die "Failed to enable debug"
+ )
}
src_compile() {
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2014-06-16 15:32 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2014-06-16 15:32 UTC (permalink / raw
To: gentoo-commits
commit: 24a4068be3a0c6f3989b3997072ffd3b98257c7c
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Mon Jun 16 09:32:08 2014 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon Jun 16 09:32:08 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=24a4068b
[dev-lang/luajit] Bump to 2.0.3
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
dev-lang/luajit/Manifest | 1 +
dev-lang/luajit/luajit-2.0.3.ebuild | 140 ++++++++++++++++++++++++++++++++++++
2 files changed, 141 insertions(+)
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index b425ae6..e506193 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1 +1,2 @@
DIST LuaJIT-2.0.2.tar.gz 843031 SHA256 c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38 SHA512 c1afea13ec61a59f37d1f61fc50bcac47208d9d4f0a80689b74e901ad2b34294b6c89a0b4eef54b43f3d2db411660da61b191b0bbfba4ba2f97743a9ee4484e3 WHIRLPOOL cb6e8ee6c5ac2293ca5d5452cda34769d3229e2d4681c0ce3c164659c2d2d781f8474e243747b197c10b3abc116e4145df6f5293317f1db871865f38ecd2b6cd
+DIST LuaJIT-2.0.3.tar.gz 844927 SHA256 55be6cb2d101ed38acca32c5b1f99ae345904b365b642203194c585d27bebd79 SHA512 7b3e3de22ac3602299b5918b60801e45a3278e547a15c16fdae7359538d4ada27ba664935d5f97c7409f330c2f8efeaae9ea03415f5e9d5a9d81e022cd5d36e0 WHIRLPOOL 1ba759b85048cfd57ebc02cfce477e9ddb327e7d27acd78f93fb2debfbf010a96e7b127324ebf6b81b1f35132f5a0a3a56ffca64fe0e66cba80c28b1cb49b433
diff --git a/dev-lang/luajit/luajit-2.0.3.ebuild b/dev-lang/luajit/luajit-2.0.3.ebuild
new file mode 100644
index 0000000..30252a5
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.0.3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: This ebuild is from Lua overlay; Bumped by mva; $
+
+EAPI="5"
+
+inherit base multilib pax-utils versionator toolchain-funcs flag-o-matic check-reqs
+
+MY_PV="$(get_version_component_range 1-3)"
+MY_P="LuaJIT-${MY_PV}"
+if [[ $(get_version_component_range 4) != "" ]]; then
+ HOTFIX="v${PV}"
+ HOTFIX="${HOTFIX/_p/_hotfix}.patch"
+fi
+
+DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
+HOMEPAGE="http://luajit.org/"
+SRC_URI="
+ http://luajit.org/download/${MY_P}.tar.gz
+ ${HOTFIX:+http://luajit.org/download/${HOTFIX}}
+"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug lua52compat +optimization"
+
+DEPEND=""
+PDEPEND="
+ virtual/lua[luajit]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+HTML_DOCS=( "doc/" )
+
+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_${1}
+ fi
+}
+
+pkg_pretend() {
+ check_req pretend
+}
+
+pkg_setup() {
+ check_req setup
+}
+
+src_prepare() {
+ if [[ -n ${HOTFIX} ]]; then
+ epatch "${DISTDIR}/${HOTFIX}"
+ fi
+
+ # fixing prefix and version
+ sed \
+ -e "s|/usr/local|/usr|" \
+ -e "s|/lib|/$(get_libdir)|" \
+ -i Makefile || die "failed to fix prefix in Makefile"
+
+ sed \
+ -e "s|/usr/local|/usr|" \
+ -e "s|lib/|$(get_libdir)/|" \
+ -i src/luaconf.h || die "failed to fix prefix in luaconf.h"
+
+ sed \
+ -e "s|/usr/local|/usr|" \
+ -e "s|lib/|$(get_libdir)/|" \
+ -i etc/luajit.pc || die "failed to fix prefix in pkg-config file"
+
+ use debug && (
+ sed -r \
+ -e 's/#(CCDEBUG= -g)/\1 -ggdb/' \
+ -i src/Makefile || die "Failed to enable debug"
+ )
+}
+
+src_compile() {
+ local opt;
+ use optimization && opt="amalg";
+
+ if gcc-fullversion 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:
+ # a) append -fPIC to CFLAGS, to use it even for temporary
+ # build-time only static host/* bins and luajit binary itself.
+ # b) append -nopie to LDFLAGS
+ # (for same binaries and same reason)
+ # c) disable ccache (even in per-package basis).
+ # This will slow down amalgamated build, but is prefered and
+ # recommended by upstream method.
+ # So, since it is impossible to use method "c" directly from
+ # ebuild, I choose method "a"
+ # (since it is more secure on hardened systems, imho) +
+ # + ewarn user, that he really should disable ccache.
+
+# append-ldflags -nopie
+ append-cflags -fPIC
+
+ ewarn "As we detected, that you're using gcc-4.7.3+pie+ccache,"
+ ewarn "we need to either:"
+ ewarn " a) add -fPIC to CFLAGS, or"
+ ewarn " b) add -nopie to LDFLAGS, or"
+ ewarn " c) disable ccache (even on per-package basis)."
+ ewarn ""
+ ewarn "We suggest you to use variant 'c' and disable it via"
+ ewarn "/etc/portage/{,package.}env (read portage manual)"
+ ewarn ""
+ ewarn "But, since we can't do that from ebuild, we'll continue"
+ ewarn "with -fPIC (variant 'a') for now, since it gives more security"
+ ewarn "on hardened systems (in our opinion)."
+ ewarn ""
+ ewarn "But, anyway, we still *HIGHLY* recommend you"
+ ewarn "to disable ccache instead."
+ fi
+
+ emake \
+ Q= \
+ HOST_CC="$(tc-getBUILD_CC)" \
+ STATIC_CC="$(tc-getCC)" \
+ DYNAMIC_CC="$(tc-getCC) -fPIC" \
+ TARGET_LD="$(tc-getCC)" \
+ TARGET_AR="$(tc-getAR) rcus" \
+ TARGET_STRIP="true" \
+ XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" \
+ "${opt}"
+}
+
+src_install() {
+ default
+ base_src_install_docs
+
+ host-is-pax && pax-mark m "${ED}usr/bin/${PN}-${MY_PV}"
+ dosym "${PN}-${MY_PV}" "/usr/bin/${PN}"
+ dobin "${FILESDIR}/luac.jit"
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2015-04-04 12:02 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2015-04-04 12:02 UTC (permalink / raw
To: gentoo-commits
commit: 64f3c54c84a9e199d09c460d6cc6d83dbab32412
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sat Apr 4 12:02:30 2015 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sat Apr 4 12:02:30 2015 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=64f3c54c
[dev-lang/luajit] Fix jit search paths
Signed-off-by: Vadim A. Misbakh-Soloviov <git <AT> mva.name>
dev-lang/luajit/luajit-2.0.9999.ebuild | 5 ++++-
dev-lang/luajit/luajit-2.1.9999.ebuild | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index fbb7b5e..86073e3 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -11,7 +11,6 @@ HOMEPAGE="http://luajit.org/"
SRC_URI=""
EGIT_REPO_URI="git://repo.or.cz/luajit-2.0.git"
SLOT="2.0"
-#EGIT_BRANCH="v${SLOT}"
LICENSE="MIT"
KEYWORDS=""
@@ -71,6 +70,10 @@ src_prepare(){
-e 's|^(TARGET_SONAME)=.*|\1=lib${PN}-${SLOT}.so.${PV}|' \
-i src/Makefile || die "Failed to slottify"
+ sed -r \
+ -e 's|^(#define.*LUA_LJDIR).*|\1 "/'${PN}-${SLOT}'/"|' \
+ -i src/luaconf.h || die "Failed to slotify"
+
use debug && (
sed -r \
-e 's/#(CCDEBUG= -g)/\1 -ggdb/' \
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index 9097d2f..73cb0ef 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -71,6 +71,10 @@ src_prepare(){
-e 's|^(TARGET_SONAME)=.*|\1=lib${PN}-${SLOT}.so.${PV}|' \
-i src/Makefile || die "Failed to slottify"
+ sed -r \
+ -e 's|^(#define.*LUA_LJDIR).*|\1 "/'${PN}-${SLOT}'/"|' \
+ -i src/luaconf.h || die "Failed to slotify"
+
use debug && (
sed -r \
-e 's/#(CCDEBUG= -g)/\1 -ggdb/' \
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2015-04-04 12:07 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2015-04-04 12:07 UTC (permalink / raw
To: gentoo-commits
commit: 8f6d2aaf752292f2f0f91e23749443f2a88fd5eb
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sat Apr 4 12:07:09 2015 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sat Apr 4 12:07:09 2015 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=8f6d2aaf
[dev-lang/luajit] Fix luajit search path
Signed-off-by: Vadim A. Misbakh-Soloviov <git <AT> mva.name>
dev-lang/luajit/luajit-2.0.9999.ebuild | 2 +-
dev-lang/luajit/luajit-2.1.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index 86073e3..8d5569a 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -71,7 +71,7 @@ src_prepare(){
-i src/Makefile || die "Failed to slottify"
sed -r \
- -e 's|^(#define.*LUA_LJDIR).*|\1 "/'${PN}-${SLOT}'/"|' \
+ -e 's|^(#define LUA_LJDIR).*|\1 "/'${PN}-${SLOT}'/"|' \
-i src/luaconf.h || die "Failed to slotify"
use debug && (
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index 73cb0ef..21cfa89 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -72,7 +72,7 @@ src_prepare(){
-i src/Makefile || die "Failed to slottify"
sed -r \
- -e 's|^(#define.*LUA_LJDIR).*|\1 "/'${PN}-${SLOT}'/"|' \
+ -e 's|^(#define LUA_LJDIR).*|\1 "/'${PN}-${SLOT}'/"|' \
-i src/luaconf.h || die "Failed to slotify"
use debug && (
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2015-04-07 3:45 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2015-04-07 3:45 UTC (permalink / raw
To: gentoo-commits
commit: fb5be7b44938334a714a5f0fe6a1d64a818f077c
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Tue Apr 7 03:45:43 2015 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Tue Apr 7 03:45:43 2015 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=fb5be7b4
[dev-lang/luajit] Fix init symlink
Signed-off-by: Vadim A. Misbakh-Soloviov <git <AT> mva.name>
dev-lang/luajit/luajit-2.0.9999.ebuild | 2 +-
dev-lang/luajit/luajit-2.1.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index 8d5569a..54a00fa 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -120,5 +120,5 @@ multilib_src_install() {
host-is-pax && pax-mark m "${ED}usr/bin/${PN}-${SLOT}"
newman "etc/${PN}-${SLOT}.1" "luacjit-${SLOT}.1"
newbin "${FILESDIR}/luac.jit" "luacjit-${SLOT}"
- [[ ! -e "/usr/bin/luajit" ]] && dosym "${PN}-${SLOT}" "${ED}usr/bin/${PN}"
+ [[ ! -e "/usr/bin/luajit" ]] && dosym "${PN}-${SLOT}" "${EROOT}usr/bin/${PN}"
}
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index 21cfa89..2f6f0f1 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -121,5 +121,5 @@ multilib_src_install() {
host-is-pax && pax-mark m "${ED}usr/bin/${PN}-${SLOT}"
newman "etc/${PN}-${SLOT}.1" "luacjit-${SLOT}.1"
newbin "${FILESDIR}/luac.jit" "luacjit-${SLOT}"
- [[ ! -e "/usr/bin/luajit" ]] && dosym "${PN}-${SLOT}" "${ED}usr/bin/${PN}"
+ [[ ! -e "/usr/bin/luajit" ]] && dosym "${PN}-${SLOT}" "${EROOT}usr/bin/${PN}"
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2015-06-08 6:26 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2015-06-08 6:26 UTC (permalink / raw
To: gentoo-commits
commit: 888980a36002b004f58db7ed411818345703908f
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Mon Jun 8 06:25:59 2015 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon Jun 8 06:25:59 2015 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=888980a3
luajit: postinst ported from ruby (autoeselect)
dev-lang/luajit/luajit-2.0.9999.ebuild | 9 +++++++++
dev-lang/luajit/luajit-2.1.9999.ebuild | 9 +++++++++
2 files changed, 18 insertions(+)
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index 54a00fa..26ec94f 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -122,3 +122,12 @@ multilib_src_install() {
newbin "${FILESDIR}/luac.jit" "luacjit-${SLOT}"
[[ ! -e "/usr/bin/luajit" ]] && dosym "${PN}-${SLOT}" "${EROOT}usr/bin/${PN}"
}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${ROOT}"usr/bin/luajit) ]] ; then
+ eselect luajit set luajit-${SLOT}
+ fi
+ if [[ ! -n $(readlink "${ROOT}"usr/bin/lua) ]] ; then
+ eselect lua set jit-${SLOT}
+ fi
+}
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index 2f6f0f1..4bac6cd 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -123,3 +123,12 @@ multilib_src_install() {
newbin "${FILESDIR}/luac.jit" "luacjit-${SLOT}"
[[ ! -e "/usr/bin/luajit" ]] && dosym "${PN}-${SLOT}" "${EROOT}usr/bin/${PN}"
}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${ROOT}"usr/bin/luajit) ]] ; then
+ eselect luajit set luajit-${SLOT}
+ fi
+ if [[ ! -n $(readlink "${ROOT}"usr/bin/lua) ]] ; then
+ eselect lua set jit-${SLOT}
+ fi
+}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2015-06-08 6:52 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2015-06-08 6:52 UTC (permalink / raw
To: gentoo-commits
commit: 52fc93f30e176367638463e810d0737683182ddc
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Mon Jun 8 06:52:28 2015 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon Jun 8 06:52:28 2015 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=52fc93f3
luajit: remove useless manual symlinking
dev-lang/luajit/luajit-2.0.9999.ebuild | 8 +++++---
dev-lang/luajit/luajit-2.1.9999.ebuild | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index 26ec94f..67c9fb0 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -19,11 +19,14 @@ IUSE="debug valgrind lua52compat +optimization"
RDEPEND="
valgrind? ( dev-util/valgrind )
"
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+ app-eselect/eselect-luajit
+ app-eselect/eselect-lua
+"
PDEPEND="
virtual/lua[luajit]
- app-eselect/eselect-luajit
"
HTML_DOCS=( "doc/" )
@@ -120,7 +123,6 @@ multilib_src_install() {
host-is-pax && pax-mark m "${ED}usr/bin/${PN}-${SLOT}"
newman "etc/${PN}-${SLOT}.1" "luacjit-${SLOT}.1"
newbin "${FILESDIR}/luac.jit" "luacjit-${SLOT}"
- [[ ! -e "/usr/bin/luajit" ]] && dosym "${PN}-${SLOT}" "${EROOT}usr/bin/${PN}"
}
pkg_postinst() {
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index 4bac6cd..ba75be0 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -20,11 +20,14 @@ IUSE="debug valgrind lua52compat +optimization"
RDEPEND="
valgrind? ( dev-util/valgrind )
"
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+ app-eselect/eselect-luajit
+ app-eselect/eselect-lua
+"
PDEPEND="
virtual/lua[luajit]
- app-eselect/eselect-luajit
"
HTML_DOCS=( "doc/" )
@@ -121,7 +124,6 @@ multilib_src_install() {
host-is-pax && pax-mark m "${ED}usr/bin/${PN}-${SLOT}"
newman "etc/${PN}-${SLOT}.1" "luacjit-${SLOT}.1"
newbin "${FILESDIR}/luac.jit" "luacjit-${SLOT}"
- [[ ! -e "/usr/bin/luajit" ]] && dosym "${PN}-${SLOT}" "${EROOT}usr/bin/${PN}"
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2015-10-31 23:52 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2015-10-31 23:52 UTC (permalink / raw
To: gentoo-commits
commit: 215455ba09ba1aca55710c919570c50d16d9add6
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sat Oct 31 23:52:10 2015 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sat Oct 31 23:52:10 2015 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=215455ba
luajit: change git repo uri
Signed-off-by: Vadim A. Misbakh-Soloviov <git <AT> mva.name>
dev-lang/luajit/luajit-2.0.9999.ebuild | 2 +-
dev-lang/luajit/luajit-2.1.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index ff280a5..5688539 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -9,7 +9,7 @@ inherit base eutils multilib multilib-minimal portability pax-utils toolchain-fu
DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
HOMEPAGE="http://luajit.org/"
SRC_URI=""
-EGIT_REPO_URI="git://repo.or.cz/luajit-2.0.git"
+EGIT_REPO_URI="http://luajit.org/git/luajit-2.0.git"
SLOT="2"
LICENSE="MIT"
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index 9d5a682..68a2986 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -9,7 +9,7 @@ inherit base eutils multilib multilib-minimal portability pax-utils toolchain-fu
DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
HOMEPAGE="http://luajit.org/"
SRC_URI=""
-EGIT_REPO_URI="git://repo.or.cz/luajit-2.0.git"
+EGIT_REPO_URI="http://luajit.org/git/luajit-2.0.git"
SLOT="2"
EGIT_BRANCH="v2.1"
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2016-04-30 6:51 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2016-04-30 6:51 UTC (permalink / raw
To: gentoo-commits
commit: 361c448ef32972f43a119fd733ec820754ae3c9b
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sat Apr 30 06:50:55 2016 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sat Apr 30 06:50:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=361c448e
luajit: change src_prep patching according makefile changes
dev-lang/luajit/luajit-2.1.9999.ebuild | 31 ++++++-------------------------
1 file changed, 6 insertions(+), 25 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index 68a2986..4a69cf2 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: This ebuild is from Lua overlay; Bumped by mva; $
-EAPI="5"
+EAPI="6"
-inherit base eutils multilib multilib-minimal portability pax-utils toolchain-funcs versionator flag-o-matic check-reqs git-r3
+inherit eutils multilib multilib-minimal portability pax-utils toolchain-funcs versionator flag-o-matic check-reqs git-r3
DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
HOMEPAGE="http://luajit.org/"
@@ -30,7 +30,7 @@ PDEPEND="
virtual/lua[luajit]
"
-HTML_DOCS=( "doc/" )
+HTML_DOCS=( "doc/." )
MULTILIB_WRAPPED_HEADERS=(
/usr/include/luajit-${SLOT}/luaconf.h
@@ -54,45 +54,26 @@ pkg_setup() {
src_prepare(){
# fixing prefix and version
-# sed -r \
-# -e 's|^(VERSION)=.*|\1=$(MAJVER).$(MINVER)|' \
-# -e 's|\$\(MAJVER\)\.\$\(MINVER\)\.\$\(RELVER\)|$(VERSION)|' \
-# -e 's|^(FILE_MAN)=.*|\1=${PN}-$(VERSION).1|' \
-# -e 's|^(INSTALL_PCNAME)=.*|\1=${PN}-$(VERSION).pc|' \
-# -e 's|^(INSTALL_SOSHORT)=.*|\1=lib${PN}-${SLOT}.so|' \
-# -e 's|^(INSTALL_ANAME)=.*|\1=lib${PN}-${SLOT}.a|' \
-# -e 's|^(INSTALL_SONAME)=.*|\1=lib${PN}-${SLOT}.so.${PV}|' \
-# -e 's|( PREFIX)=.*|\1=/usr|' \
-# -e '/\$\(SYMLINK\)\ \$\(INSTALL_TNAME\)\ \$\(INSTALL_TSYM\)/d' \
-# -i Makefile || die "failed to fix prefix in Makefile"
-
sed -r \
-e 's|^(VERSION)=.*|\1=${PV}|' \
- -e 's|\$\(MAJVER\)\.\$\(MINVER\)\.\$\(RELVER\)|$(VERSION)|' \
+ -e 's|^(INSTALL_SONAME)=.*|\1=$(INSTALL_SOSHORT1).$(VERSION)|' \
-e 's|^(INSTALL_PCNAME)=.*|\1=${P}.pc|' \
-e 's|( PREFIX)=.*|\1=/usr|' \
-e 's|^(FILE_MAN)=.*|\1=${P}.1|' \
-i Makefile || die "failed to fix prefix in Makefile"
-# sed -r \
-# -e 's|^(libname=.*-)\$\{abiver\}|\1${majver}.${minver}|' \
-# -i "etc/${PN}.pc" || die "Failed to slottify"
-
-# sed -r \
-# -e 's|^(TARGET_SONAME)=.*|\1=lib${PN}-${SLOT}.so.${PV}|' \
-# -i src/Makefile || die "Failed to slottify"
-
sed -r \
-e 's|^(#define LUA_LJDIR).*|\1 "/'${P}'/"|' \
-i src/luaconf.h || die "Failed to slotify"
use debug && (
sed -r \
- -e 's/#(CCDEBUG= -g)/\1 -ggdb/' \
+ -e 's/#(CCDEBUG= -g)/\1 -ggdb -O0/' \
-i src/Makefile || die "Failed to enable debug"
)
mv "${S}"/etc/${PN}.1 "${S}"/etc/${P}.1
+ eapply_user
multilib_copy_sources
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2017-11-01 7:58 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2017-11-01 7:58 UTC (permalink / raw
To: gentoo-commits
commit: 4efaf30a809f703d4659e4cdf6e752a3e5fdc5b1
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Wed Nov 1 07:58:14 2017 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Wed Nov 1 07:58:14 2017 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=4efaf30a
luajit: working on eprefix support
dev-lang/luajit/luajit-2.0.9999.ebuild | 6 +++---
dev-lang/luajit/luajit-2.1.9999.ebuild | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index 9920ab5..cb14064 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -70,7 +70,7 @@ src_prepare() {
-e 's|^(VERSION)=.*|\1=${PV}|' \
-e 's|\$\(MAJVER\)\.\$\(MINVER\)\.\$\(RELVER\)|$(VERSION)|' \
-e 's|^(INSTALL_PCNAME)=.*|\1=${P}.pc|' \
- -e 's|( PREFIX)=.*|\1=/usr|' \
+ -e 's|( PREFIX)=.*|\1=${EPREFIX}/usr|' \
-e 's|^(FILE_MAN)=.*|\1=${P}.1|' \
-i Makefile || die "failed to fix prefix in Makefile"
@@ -98,7 +98,7 @@ src_prepare() {
multilib_src_configure() {
sed -r \
- -e "s|^(prefix)=.*|\1=/usr|" \
+ -e "s|^(prefix)=.*|\1=${EPREFIX}/usr|" \
-e "s|^(multilib)=.*|\1=$(get_libdir)|" \
-i "etc/${PN}.pc" || die "Failed to slottify"
}
@@ -125,7 +125,7 @@ multilib_src_compile() {
}
multilib_src_install() {
- emake DESTDIR="${D}" MULTILIB="$(get_libdir)" install
+ emake DESTDIR="${ED}" MULTILIB="$(get_libdir)" install
einstalldocs
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index 31b5655..a241d93 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -59,7 +59,7 @@ src_prepare() {
-e 's|^(VERSION)=.*|\1=${PV}|' \
-e 's|^(INSTALL_SONAME)=.*|\1=$(INSTALL_SOSHORT1).$(VERSION)|' \
-e 's|^(INSTALL_PCNAME)=.*|\1=${P}.pc|' \
- -e 's|( PREFIX)=.*|\1=/usr|' \
+ -e 's|( PREFIX)=.*|\1=${EROOT}usr|' \
-e 's|^(FILE_MAN)=.*|\1=${P}.1|' \
-i Makefile || die "failed to fix prefix in Makefile"
@@ -80,7 +80,7 @@ src_prepare() {
multilib_src_configure() {
sed -r \
- -e "s|^(prefix)=.*|\1=/usr|" \
+ -e "s|^(prefix)=.*|\1=${EROOT}usr|" \
-e "s|^(multilib)=.*|\1=$(get_libdir)|" \
-i "etc/${PN}.pc" || die "Failed to slottify"
}
@@ -112,7 +112,7 @@ multilib_src_compile() {
}
multilib_src_install() {
- emake DESTDIR="${D}" MULTILIB="$(get_libdir)" install
+ emake DESTDIR="${ED}" MULTILIB="$(get_libdir)" install
einstalldocs
@@ -123,10 +123,10 @@ multilib_src_install() {
}
pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/luajit) ]] ; then
+ if [[ ! -n $(readlink "${EROOT}"usr/bin/luajit) ]] ; then
eselect luajit set luajit-${PV}
fi
- if [[ ! -n $(readlink "${ROOT}"usr/bin/lua) ]] ; then
+ if [[ ! -n $(readlink "${EROOT}"usr/bin/lua) ]] ; then
eselect lua set jit-${PV}
fi
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2017-11-01 11:43 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2017-11-01 11:43 UTC (permalink / raw
To: gentoo-commits
commit: c51bb2d03b41eaa71fb5e6861d06b5d2d32a41be
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Wed Nov 1 11:43:25 2017 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Wed Nov 1 11:43:25 2017 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=c51bb2d0
luajit: finalizing prefix-compat
dev-lang/luajit/luajit-2.0.9999.ebuild | 34 +++++++---------------------------
dev-lang/luajit/luajit-2.1.9999.ebuild | 5 ++---
2 files changed, 9 insertions(+), 30 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index cb14064..4d86ebb 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -30,7 +30,7 @@ PDEPEND="
virtual/lua[luajit]
"
-HTML_DOCS=( "doc/" )
+HTML_DOCS=( "doc/." )
MULTILIB_WRAPPED_HEADERS=(
"/usr/include/luajit-${SLOT}/luaconf.h"
@@ -53,42 +53,22 @@ pkg_setup() {
src_prepare() {
patches_src_prepare
- # fixing prefix and version
-# sed -r \
-# -e 's|^(VERSION)=.*|\1=$(MAJVER).$(MINVER)|' \
-# -e 's|\$\(MAJVER\)\.\$\(MINVER\)\.\$\(RELVER\)|$(VERSION)|' \
-# -e 's|^(FILE_MAN)=.*|\1=${PN}-$(VERSION).1|' \
-# -e 's|^(INSTALL_PCNAME)=.*|\1=${PN}-$(VERSION).pc|' \
-# -e 's|^(INSTALL_SOSHORT)=.*|\1=lib${PN}-${SLOT}.so|' \
-# -e 's|^(INSTALL_ANAME)=.*|\1=lib${PN}-${SLOT}.a|' \
-# -e 's|^(INSTALL_SONAME)=.*|\1=lib${PN}-${SLOT}.so.${PV}|' \
-# -e 's|( PREFIX)=.*|\1=/usr|' \
-# -e '/\$\(SYMLINK\)\ \$\(INSTALL_TNAME\)\ \$\(INSTALL_TSYM\)/d' \
-# -i Makefile || die "failed to fix prefix in Makefile"
sed -r \
-e 's|^(VERSION)=.*|\1=${PV}|' \
-e 's|\$\(MAJVER\)\.\$\(MINVER\)\.\$\(RELVER\)|$(VERSION)|' \
-e 's|^(INSTALL_PCNAME)=.*|\1=${P}.pc|' \
- -e 's|( PREFIX)=.*|\1=${EPREFIX}/usr|' \
+ -e 's|( PREFIX)=.*|\1=${EROOT}usr|' \
-e 's|^(FILE_MAN)=.*|\1=${P}.1|' \
-i Makefile || die "failed to fix prefix in Makefile"
-# sed -r \
-# -e 's|^(libname=.*-)\$\{abiver\}|\1${majver}.${minver}|' \
-# -i "etc/${PN}.pc" || die "Failed to slottify"
-
-# sed -r \
-# -e 's|^(TARGET_SONAME)=.*|\1=lib${PN}-${SLOT}.so.${PV}|' \
-# -i src/Makefile || die "Failed to slottify"
-
sed -r \
-e 's|^(#define LUA_LJDIR).*|\1 "/'${P}'/"|' \
-i src/luaconf.h || die "Failed to slotify"
use debug && (
sed -r \
- -e 's/#(CCDEBUG= -g)/\1 -ggdb/' \
+ -e 's/#(CCDEBUG= -g)/\1 -OO/' \
-i src/Makefile || die "Failed to enable debug"
)
mv "${S}"/etc/${PN}.1 "${S}"/etc/${P}.1
@@ -98,7 +78,7 @@ src_prepare() {
multilib_src_configure() {
sed -r \
- -e "s|^(prefix)=.*|\1=${EPREFIX}/usr|" \
+ -e "s|^(prefix)=.*|\1=${EROOT}usr|" \
-e "s|^(multilib)=.*|\1=$(get_libdir)|" \
-i "etc/${PN}.pc" || die "Failed to slottify"
}
@@ -125,7 +105,7 @@ multilib_src_compile() {
}
multilib_src_install() {
- emake DESTDIR="${ED}" MULTILIB="$(get_libdir)" install
+ emake DESTDIR="${D}" MULTILIB="$(get_libdir)" install
einstalldocs
@@ -136,10 +116,10 @@ multilib_src_install() {
}
pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/luajit) ]] ; then
+ if [[ ! -n $(readlink "${EROOT}"usr/bin/luajit) ]] ; then
eselect luajit set luajit-${PV}
fi
- if [[ ! -n $(readlink "${ROOT}"usr/bin/lua) ]] ; then
+ if [[ ! -n $(readlink "${EROOT}"usr/bin/lua) ]] ; then
eselect lua set jit-${PV}
fi
}
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index a241d93..f0d3866 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -69,12 +69,11 @@ src_prepare() {
use debug && (
sed -r \
- -e 's/#(CCDEBUG= -g)/\1 -ggdb -O0/' \
+ -e 's/#(CCDEBUG= -g)/\1 -O0/' \
-i src/Makefile || die "Failed to enable debug"
)
mv "${S}"/etc/${PN}.1 "${S}"/etc/${P}.1
- eapply_user
multilib_copy_sources
}
@@ -112,7 +111,7 @@ multilib_src_compile() {
}
multilib_src_install() {
- emake DESTDIR="${ED}" MULTILIB="$(get_libdir)" install
+ emake DESTDIR="${D}" MULTILIB="$(get_libdir)" install
einstalldocs
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2017-11-02 7:21 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2017-11-02 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 94ea242e229f19f88c2c451c0b6a7445d90c43b7
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Thu Nov 2 07:20:56 2017 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Thu Nov 2 07:20:56 2017 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=94ea242e
luajit: fix non-amalgamated build
dev-lang/luajit/luajit-2.0.9999.ebuild | 2 +-
dev-lang/luajit/luajit-2.1.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.0.9999.ebuild b/dev-lang/luajit/luajit-2.0.9999.ebuild
index 4d86ebb..e12dc2e 100644
--- a/dev-lang/luajit/luajit-2.0.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.0.9999.ebuild
@@ -101,7 +101,7 @@ multilib_src_compile() {
HOST_CC="$(tc-getCC)" \
CC="${CC}" \
TARGET_STRIP="true" \
- XCFLAGS="${xcflags[*]}" "${opt}"
+ XCFLAGS="${xcflags[*]}" ${opt}
}
multilib_src_install() {
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index f0d3866..033bdfd 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -107,7 +107,7 @@ multilib_src_compile() {
HOST_CC="$(tc-getCC)" \
CC="${CC}" \
TARGET_STRIP="true" \
- XCFLAGS="${xcflags[*]}" "${opt}"
+ XCFLAGS="${xcflags[*]}" ${opt}
}
multilib_src_install() {
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/
@ 2019-07-14 15:49 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 34+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2019-07-14 15:49 UTC (permalink / raw
To: gentoo-commits
commit: 7b70877480d02c10f382aa43cdcaac875748b6c4
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sun Jul 14 15:48:54 2019 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sun Jul 14 15:48:54 2019 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=7b708774
luajit: fir EROOT
Signed-off-by: Vadim A. Misbakh-Soloviov <git <AT> mva.name>
dev-lang/luajit/luajit-2.1.9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index d17a29e..29cade4 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -59,7 +59,7 @@ src_prepare() {
-e 's|^(VERSION)=.*|\1=${PV}|' \
-e 's|^(INSTALL_SONAME)=.*|\1=$(INSTALL_SOSHORT1).$(VERSION)|' \
-e 's|^(INSTALL_PCNAME)=.*|\1=${P}.pc|' \
- -e 's|( PREFIX)=.*|\1=${EROOT}usr|' \
+ -e 's|( PREFIX)=.*|\1='${EROOT:-/}'usr|' \
-e 's|^(FILE_MAN)=.*|\1=${P}.1|' \
-i Makefile || die "failed to fix prefix in Makefile"
@@ -79,7 +79,7 @@ src_prepare() {
multilib_src_configure() {
sed -r \
- -e "s|^(prefix)=.*|\1=${EROOT}usr|" \
+ -e "s|^(prefix)=.*|\1=${EROOT:-/}usr|" \
-e "s|^(multilib)=.*|\1=$(get_libdir)|" \
-i "etc/${PN}.pc" || die "Failed to slottify"
}
^ permalink raw reply related [flat|nested] 34+ messages in thread
end of thread, other threads:[~2019-07-14 15:49 UTC | newest]
Thread overview: 34+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-01 11:43 [gentoo-commits] proj/lua:master commit in: dev-lang/luajit/ Vadim A. Misbakh-Soloviov
-- strict thread matches above, loose matches on Subject: below --
2019-07-14 15:49 Vadim A. Misbakh-Soloviov
2017-11-02 7:21 Vadim A. Misbakh-Soloviov
2017-11-01 7:58 Vadim A. Misbakh-Soloviov
2016-04-30 6:51 Vadim A. Misbakh-Soloviov
2015-10-31 23:52 Vadim A. Misbakh-Soloviov
2015-06-08 6:52 Vadim A. Misbakh-Soloviov
2015-06-08 6:26 Vadim A. Misbakh-Soloviov
2015-04-07 3:45 Vadim A. Misbakh-Soloviov
2015-04-04 12:07 Vadim A. Misbakh-Soloviov
2015-04-04 12:02 Vadim A. Misbakh-Soloviov
2014-06-16 15:32 Vadim A. Misbakh-Soloviov
2014-01-21 20:15 Vadim A. Misbakh-Soloviov
2013-12-29 12:13 Vadim A. Misbakh-Soloviov
2013-12-18 18:27 Vadim A. Misbakh-Soloviov
2013-12-18 11:58 Vadim A. Misbakh-Soloviov
2013-05-27 20:30 Vadim A. Misbakh-Soloviov
2013-05-27 19:42 Vadim A. Misbakh-Soloviov
2013-05-27 18:49 Vadim A. Misbakh-Soloviov
2013-05-27 18:35 Vadim A. Misbakh-Soloviov
2013-05-27 7:52 Vadim A. Misbakh-Soloviov
2013-05-26 22:01 Vadim A. Misbakh-Soloviov
2013-05-26 8:31 Vadim A. Misbakh-Soloviov
2013-05-10 8:53 Vadim A. Misbakh-Soloviov
2013-03-19 7:31 Vadim A. Misbakh-Soloviov
2012-08-08 20:38 Misbakh-Soloviev Vadim A.
2012-08-08 13:01 Misbakh-Soloviev Vadim A.
2012-08-08 12:39 Misbakh-Soloviev Vadim A.
2012-08-08 12:32 Misbakh-Soloviev Vadim A.
2012-07-13 18:27 Misbakh-Soloviev Vadim A.
2012-07-13 2:31 Misbakh-Soloviev Vadim A.
2012-07-13 1:55 Misbakh-Soloviev Vadim A.
2012-07-12 22:46 Misbakh-Soloviev Vadim A.
2012-05-09 5:48 Misbakh-Soloviev Vadim A.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox