summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorVadim A. Misbakh-Soloviov <git@mva.name>2015-10-03 05:20:51 +0600
committerVadim A. Misbakh-Soloviov <git@mva.name>2015-10-03 05:20:51 +0600
commitecc5995097fcecc06aa4794013659dd5cd48415d (patch)
treeb5b942779cf18694de0de7556539e5002cb9127d /eclass
parentsome more porting (diff)
downloadlua-ecc5995097fcecc06aa4794013659dd5cd48415d.tar.gz
lua-ecc5995097fcecc06aa4794013659dd5cd48415d.tar.bz2
lua-ecc5995097fcecc06aa4794013659dd5cd48415d.zip
Finished porting to lua.eclass
Signed-off-by: Vadim A. Misbakh-Soloviov <git@mva.name>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/lua.eclass21
1 files changed, 13 insertions, 8 deletions
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 9328254..0a03b11 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -662,9 +662,9 @@ _lua_src_install_examples() {
debug-print-function $FUNCNAME "$@"
local x
- local MY_S="${WORKDIR}/all/${P}"
+# local MY_S="${LUA_S:-${WORKDIR}/all/${P}}"
- pushd "${MY_S}" >/dev/null
+# pushd "${MY_S}" >/dev/null
if [[ "$(declare -p EXAMPLES 2>/dev/null 2>&1)" == "declare -a"* ]]; then
for x in "${EXAMPLES[@]}"; do
@@ -675,15 +675,20 @@ _lua_src_install_examples() {
done
fi
- popd >/dev/null
+# popd >/dev/null
}
_lua_src_install_docs() {
debug-print-function $FUNCNAME "$@"
local x
- local MY_S="${WORKDIR}/all/${P}"
- pushd "${MY_S}" >/dev/null
+# local MY_S;
+# if [[ -z "${LUA_S}" ]]; then
+# MY_S="${WORKDIR}/all/${P}"
+# else
+# MY_S="${WORKDIR}/all/${LUA_S}"
+# fi
+# pushd "${MY_S}" >/dev/null
if [[ "$(declare -p DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then
for x in "${DOCS[@]}"; do
@@ -700,7 +705,7 @@ _lua_src_install_docs() {
done
fi
- popd >/dev/null
+# popd >/dev/null
}
#### END ####
@@ -775,7 +780,7 @@ _lua_install_cmod() {
}
_lua_jit_insopts() {
- [[ "${LUA}" =~ "luajit" ]] || return 0
+ [[ "${LUA}" =~ "luajit" ]] || die "Calling dolua_jit for non-jit targets isn't supported"
local insdir=$(${LUA} -e 'print(package.path:match(";(/[^;]+luajit[^;]+)/%?.lua;"))')
insinto ${insdir}
insopts -m 0644
@@ -783,7 +788,7 @@ _lua_jit_insopts() {
dolua_jit() {
_lua_jit_insopts
- doins "$@"
+ doins -r "$@"
}
newlua_jit() {