summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorVadim A. Misbakh-Soloviov <git@mva.name>2016-07-26 02:57:46 +0700
committerVadim A. Misbakh-Soloviov <git@mva.name>2016-07-26 02:57:46 +0700
commitc731b26174f23830ac6be9684b545602cc57b8ea (patch)
treecced31053d78b2b5c5d429a3ec5d66a45a5bf820 /eclass
parentmsgpack: update ebuild (diff)
downloadlua-c731b26174f23830ac6be9684b545602cc57b8ea.tar.gz
lua-c731b26174f23830ac6be9684b545602cc57b8ea.tar.bz2
lua-c731b26174f23830ac6be9684b545602cc57b8ea.zip
dev-lua/*: move to EAPI=6 + renewed lua.eclass
Diffstat (limited to 'eclass')
-rw-r--r--eclass/lua.eclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index bf1e4fb..7bfc398 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -61,9 +61,9 @@
# you are looking for if you get the related "Missing links" QA warning,
# since the proper fix is almost always to make sure the shared object
# is linked against liblua. There are cases were this is not the case
-# and the shared object is generic code to be used in some other way
-# (e.g. selenium's firefox driver extension). When set this argument is
-# passed to "grep -E" to remove reporting of these shared objects.
+# and the shared object is generic code to be used in some other way.
+# When set this argument is passed to "grep -E" to remove reporting of
+# these shared objects.
: ${GLOBAL_CFLAGS-${CFLAGS}}
: ${GLOBAL_CXXFLAGS-${CXXFLAGS}}
@@ -198,7 +198,7 @@ _lua_atoms_samelib_generic() {
;;
*])
echo "${token%[*}[LUATARGET,${token/*[}"
- #"]}" # <= kludge for vim's syntax highlighting engine to don't mess up all the things below this line
+ #"]}" # <- kludge for vim's syntax highlighting engine to don't mess up all the things below this line
;;
*)
echo "${token}[LUATARGET]"
@@ -811,7 +811,7 @@ _lua_install_cmod() {
_lua_jit_insopts() {
[[ "${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}
+ insinto ${insdir}/${_dolua_jit_insdir}
insopts -m 0644
}
@@ -917,8 +917,8 @@ _lua_default_all_prepare() {
-e 's#(^LFLAGS[[:space:]]*)[[:punct:]]*=#\1+=$(LDCONFIG)#' \
-e 's#`pkg-config#`$(PKG_CONFIG)#g' \
-e 's#(shell[[:space:][:punct:]]*)pkg-config#\1$(PKG_CONFIG)#g' \
- -e 's#lua5.[[:digit:]]#$(LUA_IMPL)#g' \
-e 's#-llua[[:digit:][:punct:]]*#__LESLPH__#g;s#__LESLPH__([[:alpha:]])#-llua\1#g;s#__LESLPH__#$(LUA_LINK_LIB)#g' \
+ -e 's#lua5.[[:digit:]]#$(LUA_IMPL)#g' \
"${mf}"
fi
touch ${T}/.lua_ecl_conf