* [gentoo-commits] proj/lua:master commit in: eclass/
@ 2015-10-22 11:30 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 11+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2015-10-22 11:30 UTC (permalink / raw
To: gentoo-commits
commit: 7dbfdc93c94b097e4c7f2c9e0ad7fc8d6dc3dd71
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Thu Oct 22 11:30:46 2015 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Thu Oct 22 11:30:46 2015 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=7dbfdc93
fixed HTML docs installation
Signed-off-by: Vadim A. Misbakh-Soloviov <git <AT> mva.name>
eclass/lua.eclass | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 0a03b11..0b7918f 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -639,6 +639,10 @@ lua_src_install() {
done;
README_DOCS+=(${READMES[@]})
+ if [[ -n "${HTML_DOCS}" ]] && ! use doc; then
+ unset HTML_DOCS
+ fi
+
if [[ -n "${README_DOCS}" ]]; then
export DOCS=(${README_DOCS[@]});
_PHASE="install readmes" _lua_invoke_environment all _lua_src_install_docs
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/lua:master commit in: eclass/
@ 2016-05-27 22:13 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 11+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2016-05-27 22:13 UTC (permalink / raw
To: gentoo-commits
commit: b88050a61100369a3563064c56bfba5dcd36bc0c
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Wed May 25 13:08:41 2016 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Wed May 25 13:08:41 2016 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=b88050a6
lua.eclass: some sugar
eclass/lua.eclass | 146 +++++++++++++++++++++++++++++++-----------------------
1 file changed, 85 insertions(+), 61 deletions(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 7e5af27..bf1e4fb 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# @ECLASS: lua.eclass
# @MAINTAINER:
@@ -75,20 +74,55 @@
[[ -n "${IS_MULTILIB}" ]] && multilib="multilib-minimal"
-inherit base eutils ${multilib} toolchain-funcs flag-o-matic ${VCS}
+
+case ${VCS} in
+ git)
+ VCS="git-r3"
+ ;;
+ hg)
+ VCS="mercurial"
+ ;;
+ svn)
+ VCS="subversion"
+ ;;
+esac
+
+[[ -n "${GITHUB_A}" && -n "${BITBUCKET_A}" ]] && die "Only one of GITHUB_A or BITBUCKET_A should be set!"
+if [[ -n "${GITHUB_A}" ]]; then
+ GITHUB_PN="${GITHUB_PN:-${PN}}"
+ EVCS_URI="https://github.com/${GITHUB_A}/${GITHUB_PN}"
+ DL="archive"
+elif [[ -n "${BITBUCKET_A}" ]]; then
+ BITBUCKET_PN="${BITBUCKET_PN:-${PN}}"
+ EVCS_URI="https://bitbucket.org/${BITBUCKET_A}/${BITBUCKET_PN}"
+ DL="get"
+fi
+if [[ -z "${EGIT_REPO_URI}" && -z "${EHG_REPO_URI}" && -z "${SRC_URI}" && -n "${EVCS_URI}" ]]; then
+ if [[ "${VCS}" = git* ]]; then
+ EGIT_REPO_URI="${EVCS_URI}"
+ elif [[ "${VCS}" = "mercurial" ]]; then
+ EHG_REPO_URI="${EVCS_URI}"
+ elif [[ -z "${VCS}" && "${PV}" != *9999* ]]; then
+ SRC_URI="${EVCS_URI}/${DL}/${GITHUB_PV:-${PV}}.tar.gz -> ${P}.tar.gz"
+ fi
+fi
+
+inherit eutils ${multilib} toolchain-funcs flag-o-matic ${VCS}
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_setup src_test
-case ${EAPI} in
- 0|1)
- die "Unsupported EAPI=${EAPI} (too old) for lua.eclass" ;;
- 2|3) ;;
- 4|5)
+case ${EAPI:-0} in
+ 0|1|2|3)
+ die "Unsupported EAPI=${EAPI} (too old) for lua.eclass"
+ ;;
+ 4|5|6)
# S is no longer automatically assigned when it doesn't exist.
S="${WORKDIR}"
;;
*)
- die "Unknown EAPI=${EAPI} for lua.eclass"
+ ewarn "Unknown EAPI=${EAPI} for lua.eclass. Some things may become broken"
+ ewarn "Please, review lua.eclass for compatibility with new EAPI"
+ ;;
esac
lua_implementation_depend() {
@@ -164,7 +198,7 @@ _lua_atoms_samelib_generic() {
;;
*])
echo "${token%[*}[LUATARGET,${token/*[}"
- #" <= kludge for vim's syntax highlighting engine to don't mess up all
+ #"]}" # <= kludge for vim's syntax highlighting engine to don't mess up all the things below this line
;;
*)
echo "${token}[LUATARGET]"
@@ -309,49 +343,33 @@ IUSE+="$(lua_get_use_targets)"
if [[ ${LUA_OPTIONAL} != yes ]]; then
DEPEND="${DEPEND} $(lua_implementations_depend)"
RDEPEND="${RDEPEND} $(lua_implementations_depend)"
-
- case ${EAPI:-0} in
- 4|5)
- REQUIRED_USE+=" || ( $(lua_get_use_targets) )"
- ;;
- esac
+ REQUIRED_USE+=" || ( $(lua_get_use_targets) )"
fi
_lua_invoke_environment() {
old_S=${S}
- case ${EAPI} in
- 4|5)
- if [ -z "${LUA_S}" ]; then
- sub_S=${P}
- else
- sub_S=${LUA_S}
- fi
- ;;
- *)
- sub_S=${S#${WORKDIR}/}
- ;;
- esac
+ if [ -z "${LUA_S}" ]; then
+ sub_S=${P}
+ else
+ sub_S=${LUA_S}
+ fi
- # Special case, for the always-lovely GitHub fetches. With this,
+ # Special case, for GitHub fetches of ancient packages. With this,
# we allow the star glob to just expand to whatever directory it's
# called.
if [[ "${sub_S}" = *"*"* ]]; then
- case ${EAPI} in
- 2|3)
- #The old method of setting S depends on undefined package
- # manager behaviour, so encourage upgrading to EAPI=4.
- eqawarn "Using * expansion of S is deprecated. Use EAPI and LUA_S instead."
- ;;
- esac
pushd "${WORKDIR}"/all &>/dev/null
sub_S=$(eval ls -d "${sub_S}" 2>/dev/null)
popd &>/dev/null
fi
- environment=$1; shift
+ environment="${1}"; shift
- my_WORKDIR="${WORKDIR}"/${environment}
+ my_WORKDIR="${WORKDIR}"/"${environment}"
S="${my_WORKDIR}"/"${sub_S}"
+ EGIT_CHECKOUT_DIR="${S}"
+ EHG_CHECKOUT_DIR="${S}"
+ EBZR_UNPACK_DIR="${S}"
BUILD_DIR="${S}"
CMAKE_USE_DIR="${S}"
@@ -416,15 +434,22 @@ lua_src_unpack() {
# We don't support an each-unpack, it's either all or nothing!
if type all_lua_unpack &>/dev/null; then
_lua_invoke_environment all all_lua_unpack
+ elif [[ -n ${VCS} ]] && declare -f ${VCS}_src_unpack >/dev/null; then
+ _lua_invoke_environment all ${VCS}_src_unpack
+ elif declare -f unpacker_src_unpack >/dev/null; then
+ _lua_invoke_environment all unpacker_src_unpack
elif [[ -n ${A} ]]; then
unpack ${A}
- elif [[ -n ${VCS} ]] && declare -f ${VCS}_src_unpack >/dev/null; then
- _lua_invoke_environment all ${VCS}_src_unpack
+ elif [[ -z "${GITHUB_A}" && -z "${BITBUCKET_A}" ]]; then
+ eerror "Either GITHUB_A or BITBUCKET_A (author nick) should be set for magic SRC/REPO URI filling to work"
+ eerror "You should either set one of them, or fill the proper URI variable manually!"
+ die "See above eerror messages."
fi
- # hack for VCS-eclasses (git-r3 and darcs, for now) which defaults unpack dir to WD/P instead of S
- if [[ '*9999*' =~ ${PV} ]] && [[ -d ${WORKDIR}/${P} ]] && [[ ! -d ${WORKDIR}/all/${P} ]] ; then
- mv ${WORKDIR}/${P} ${WORKDIR}/all/${P}
+ # hack for VCS-eclasses (darcs, for example) which defaults unpack dir to WD/P instead of S
+ if [[ "${PV}" = *9999* ]] && [[ -d "${WORKDIR}/${P}" ]] && [[ ! -d "${WORKDIR}/all/${P}" ]] ; then
+ die "darcs-patching :: git test"
+ mv "${WORKDIR}/${P}" "${WORKDIR}/all/${P}"
fi
popd &>/dev/null
@@ -485,7 +510,7 @@ lua_src_prepare() {
_lua_invoke_environment all ${VCS}_src_prepare
fi
- _lua_invoke_environment all base_src_prepare
+ _lua_invoke_environment all default_src_prepare
if ! declare -f all_lua_prepare >/dev/null; then
all_lua_prepare() {
@@ -903,11 +928,12 @@ _lua_default_all_prepare() {
_lua_default_all_compile() {
local doc_target="${DOC_MAKE_TARGET:=doc}"
+
has doc ${IUSE} &&
use doc &&
grep -qs "${doc_target}[[:space:]]*:" {GNUm,m,M}akefile && (
[[ -f ${T}/.lua_ecl_conf ]] && touch .lua_eclass_config
- base_src_compile "${doc_target[@]}"
+ emake "${doc_target[@]}"
)
}
@@ -921,7 +947,7 @@ _lua_default_each_configure() {
confargs+=("${myeconfargs[@]}")
confargs+=("${@}")
- base_src_configure "${confargs[@]}"
+ [[ -x ${ECONF_SOURCE:-.}/configure ]] && econf "${confargs[@]}"
if [[ -f ${T}/.lua_ecl_conf ]]; then
touch .lua_eclass_config
@@ -949,12 +975,6 @@ _lua_default_each_configure() {
_lua_default_each_compile() {
local makeargs=();
-
- makeargs+=(
- "${myemakeargs[@]}"
- "${@}"
- )
-
if has ccache ${FEATURES} && [[ "${NOCCACHE}" = "true" ]]; then
export CCACHE_DISABLE=1;
fi
@@ -963,18 +983,22 @@ _lua_default_each_compile() {
export DISTCC_DISABLE=1;
fi
- base_src_compile "${makeargs[@]}"
+ if [[ -f Makefile || -f GNUmakefile || -f makefile ]]; then
+ makeargs+=("${myemakeargs[@]}")
+ makeargs+=("${@}")
+ emake "${makeargs[@]}"
+ fi
+
}
_lua_default_each_install() {
local instargs=();
- instargs+=(
- DESTDIR="${D}"
- "${@}"
- "${myeinstallargs[@]}"
- install
- )
-
- base_src_make "${instargs[@]}"
+ if [[ -f Makefile || -f GNUmakefile || -f makefile ]]; then
+ instargs+=(DESTDIR="${D}")
+ instargs+=("${@}")
+ instargs+=("${myeinstallargs[@]}")
+ instargs+=("install")
+ emake "${instargs[@]}"
+ fi
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/lua:master commit in: eclass/
@ 2016-12-28 7:05 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 11+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2016-12-28 7:05 UTC (permalink / raw
To: gentoo-commits
commit: 7e3b511ec8ac0b8c9e62c3899a56efd88badb440
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Wed Dec 28 07:04:49 2016 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Wed Dec 28 07:04:49 2016 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=7e3b511e
lua.eclass: fix double calling of "default"
eclass/lua.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 576db91..99b2eef 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -515,7 +515,7 @@ lua_src_prepare() {
_lua_invoke_environment all ${VCS}_src_prepare
fi
- _lua_invoke_environment all default_src_prepare
+# _lua_invoke_environment all default_src_prepare
if ! declare -f all_lua_prepare >/dev/null; then
all_lua_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/lua:master commit in: eclass/
@ 2017-01-10 9:56 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 11+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2017-01-10 9:56 UTC (permalink / raw
To: gentoo-commits
commit: 00dad27ba2e9cd7ddc5cdcd131d43feadba23dbb
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Tue Jan 10 09:55:57 2017 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Tue Jan 10 09:55:57 2017 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=00dad27b
lua.eclass: fix
eclass/lua.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 99b2eef..02483e7 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -297,7 +297,7 @@ lua_add_bdepend() {
lua_get_use_implementations() {
local i=() implementation
for implementation in ${LUA_COMPAT}; do
- if [[ -z "${LUA_IGNORE_TARGET_DUPLICATION}" ]] && [ "${implementation}" = "lua51" ] && in_iuse lua_targets_luajit2 && use lua_targets_luajit2; then
+ if [[ -z "${LUA_IGNORE_TARGET_DUPLICATION}" ]] && [ "${implementation}" = "lua51" ] && in_iuse lua_targets_luajit2 && use lua_targets_luajit2 && use lua_targets_lua51; then
ewarn "LuaJIT using same LMOD/CMOD install paths as lua51."
ewarn "Lua target 'lua51' was skipped to avoid useless double compilation and file overwrites."
ewarn "If you definitelly want to compile lua51 target for nothing (i.e. you're maintainer),"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/lua:master commit in: eclass/
@ 2017-04-06 3:54 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 11+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2017-04-06 3:54 UTC (permalink / raw
To: gentoo-commits
commit: cad3d75d50ae5138247482f244e871cb5a6d6267
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Thu Apr 6 03:53:46 2017 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Thu Apr 6 03:53:46 2017 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=cad3d75d
lua.eclass: custom configure support
eclass/lua.eclass | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index aeb2cdc..d520e5c 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -954,7 +954,11 @@ _lua_default_each_configure() {
confargs+=("${myeconfargs[@]}")
confargs+=("${@}")
- [[ -x ${ECONF_SOURCE:-.}/configure ]] && econf "${confargs[@]}"
+ (
+ [[ -x ${ECONF_SOURCE:-.}/configure ]] &&
+ [[ -z "${CUSTOM_ECONF}" ]]
+ ) &&
+ econf "${confargs[@]}"
if [[ -f ${T}/.lua_ecl_conf ]]; then
touch .lua_eclass_config
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/lua:master commit in: eclass/
@ 2017-11-01 12:03 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 11+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2017-11-01 12:03 UTC (permalink / raw
To: gentoo-commits
commit: f089709d0eccbf4b7b75daa3e98088fb01b8d229
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Wed Nov 1 12:03:36 2017 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Wed Nov 1 12:03:36 2017 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=f089709d
lua.eclass: support for patches eclass
eclass/lua.eclass | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 75ff32e..9eba0df 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -34,11 +34,6 @@
# is compatible to. It must be set before the `inherit' call.
: ${LUA_COMPAT:=lua51 lua52 lua53 luajit2}
-# @ECLASS-VARIABLE: LUA_PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# A String or Array of filenames of patches to apply to all implementations.
-
# @ECLASS-VARIABLE: LUA_OPTIONAL
# @DESCRIPTION:
# Set the value to "yes" to make the dependency on a Lua interpreter
@@ -108,7 +103,7 @@ if [[ -z "${EGIT_REPO_URI}" && -z "${EHG_REPO_URI}" && -z "${SRC_URI}" && -n "${
fi
fi
-inherit eutils ${multilib} toolchain-funcs flag-o-matic ${VCS}
+inherit eutils ${multilib} toolchain-funcs flag-o-matic ${VCS} patches
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_setup src_test
@@ -655,7 +650,7 @@ lua_src_install() {
README_DOCS=(${DOCS[@]});
OTHER_DOCS=(${DOCS[@]//README*});
# MY_S="${WORKDIR}/all/${P}"
-
+
unset DOCS;
for r in ${OTHER_DOCS[@]}; do
@@ -909,8 +904,7 @@ _lua_default_all_prepare() {
"${@}"
)
- [[ "${EAPI}" -lt 6 ]] && epatch_user
- default
+ patches_src_prepare
[[ -x "${BOOTSTRAP}" ]] && ${BOOTSTRAP} "${prepargs[@]}"
@@ -946,7 +940,7 @@ _lua_default_all_compile() {
}
#lua_default_all_install() {
-#
+#
#}
_lua_default_each_configure() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/lua:master commit in: eclass/
@ 2017-11-01 12:18 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 11+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2017-11-01 12:18 UTC (permalink / raw
To: gentoo-commits
commit: dba34d0c470249bf7ab8f881cf9f9160d2bc6502
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Wed Nov 1 12:18:25 2017 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Wed Nov 1 12:18:25 2017 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=dba34d0c
lua.eclass: prefix-compat work
eclass/lua.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 9eba0df..c319f91 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -814,7 +814,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}/${_dolua_jit_insdir}
+ insinto ${insdir#${EPREFIX}}/${_dolua_jit_insdir}
insopts -m 0644
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/lua:master commit in: eclass/
@ 2017-11-02 6:39 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 11+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2017-11-02 6:39 UTC (permalink / raw
To: gentoo-commits
commit: d14c0ba6fbdbc5c5c9f7d3dc975d9ccdf8fb8f18
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Thu Nov 2 06:38:29 2017 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Thu Nov 2 06:38:29 2017 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=d14c0ba6
lua.eclass: add lua5.3-related integers definition to c{,xx}flags
eclass/lua.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index c319f91..79e80c8 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -480,8 +480,8 @@ _lua_setFLAGS() {
LUA_LF="$(${PKG_CONFIG} --libs $(basename ${lua}))"
LUA_LF="${LUA_LF//-llua /-l$(lua_get_lua) }"
- CFLAGS="${GLOBAL_CFLAGS} ${LUA_CF} -fPIC -DPIC"
- CXXFLAGS="${GLOBAL_CXXFLAGS} ${LUA_CF} -fPIC -DPIC"
+ CFLAGS="${GLOBAL_CFLAGS} ${LUA_CF} -fPIC -DPIC -DLUA_C89_NUMBERS"
+ CXXFLAGS="${GLOBAL_CXXFLAGS} ${LUA_CF} -fPIC -DPIC -DLUA_C89_NUMBERS"
LDFLAGS="${GLOBAL_LDFLAGS} -shared -fPIC"
export CC CXX LD CFLAGS CXXFLAGS LDFLAGS PKG_CONFIG LUA_LF
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/lua:master commit in: eclass/
@ 2017-11-02 19:47 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 11+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2017-11-02 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 7fd087cc738bc61ae084a5eb5b8062b8e0121211
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Thu Nov 2 19:42:35 2017 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Thu Nov 2 19:42:35 2017 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=7fd087cc
lua.eclass: revert c89-numbers on lua53
eclass/lua.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 79e80c8..c319f91 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -480,8 +480,8 @@ _lua_setFLAGS() {
LUA_LF="$(${PKG_CONFIG} --libs $(basename ${lua}))"
LUA_LF="${LUA_LF//-llua /-l$(lua_get_lua) }"
- CFLAGS="${GLOBAL_CFLAGS} ${LUA_CF} -fPIC -DPIC -DLUA_C89_NUMBERS"
- CXXFLAGS="${GLOBAL_CXXFLAGS} ${LUA_CF} -fPIC -DPIC -DLUA_C89_NUMBERS"
+ CFLAGS="${GLOBAL_CFLAGS} ${LUA_CF} -fPIC -DPIC"
+ CXXFLAGS="${GLOBAL_CXXFLAGS} ${LUA_CF} -fPIC -DPIC"
LDFLAGS="${GLOBAL_LDFLAGS} -shared -fPIC"
export CC CXX LD CFLAGS CXXFLAGS LDFLAGS PKG_CONFIG LUA_LF
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/lua:master commit in: eclass/
@ 2018-08-08 16:19 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 11+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2018-08-08 16:19 UTC (permalink / raw
To: gentoo-commits
commit: d25da575c4febd132a9abe8571a0341e8544df98
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Wed Aug 8 16:18:41 2018 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Wed Aug 8 16:18:41 2018 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=d25da575
lua.eclass: bump
eclass/lua.eclass | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index c319f91..07b1e7a 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -61,12 +61,12 @@
# When set this argument is passed to "grep -E" to remove reporting of
# these shared objects.
-: ${GLOBAL_CFLAGS-${CFLAGS}}
-: ${GLOBAL_CXXFLAGS-${CXXFLAGS}}
-: ${GLOBAL_LDFLAGS-${LDFLAGS}}
+: ${GLOBAL_CFLAGS:=${CFLAGS}}
+: ${GLOBAL_CXXFLAGS:=${CXXFLAGS}}
+: ${GLOBAL_LDFLAGS:=${LDFLAGS}}
-: ${NOCCACHE-false}
-: ${NODISTCC-false}
+: ${NOCCACHE:=false}
+: ${NODISTCC:=false}
[[ -n "${IS_MULTILIB}" ]] && multilib="multilib-minimal"
@@ -111,7 +111,7 @@ case ${EAPI:-0} in
0|1|2|3)
die "Unsupported EAPI=${EAPI} (too old) for lua.eclass"
;;
- 4|5|6)
+ 4|5|6|7)
# S is no longer automatically assigned when it doesn't exist.
S="${WORKDIR}"
;;
@@ -162,7 +162,7 @@ lua_implementation_command() {
;;
esac
- local lua=$(readlink -fs $(type -p $(basename ${_lua_name} 2>/dev/null)) 2>/dev/null)
+ local lua=$(readlink -fs $(type -p $(basename ${_lua_name:-lua} 2>/dev/null)) 2>/dev/null)
[[ -x ${lua} ]] || die "Unable to locate executable Lua interpreter"
echo "${lua}"
}
@@ -405,7 +405,7 @@ _lua_each_implementation() {
_lua_invoke_environment ${_lua_implementation} "$@"
fi
- unset LUA TARGET lua_impl
+ unset LUA TARGET
done
if [[ ${invoked} == "no" ]]; then
@@ -465,9 +465,18 @@ _lua_source_copy() {
|| die "Unable to copy ${_lua_implementation} environment"
}
-_lua_setFLAGS() {
- local lua=$(readlink -fs $(type -p $(basename ${LUA:-lua} 2>/dev/null)) 2>/dev/null)
+_lua_get_lf() {
+# local lua=$(readlink -fs $(type -p $(basename ${LUA:-lua} 2>/dev/null)) 2>/dev/null)
+ local lf;
+ lf=$(sed -r -e "s@-llua @-l$(lua_get_lua) @" -e "s@(-L[^ ]*)lib[0-9]*([^ ]*)@\1$(get_libdir)\2@" <<< "$(${PKG_CONFIG} --libs ${lua_impl})")
+ echo "${lf}"
+}
+_lua_get_cf() {
+ echo "$(${PKG_CONFIG} --cflags ${lua_impl})"
+}
+
+_lua_setFLAGS() {
unset PKG_CONFIG LD
# CC CXX CFLAGS CXXFLAGS LDFLAGS LUA_CF LUA_LF
@@ -476,9 +485,8 @@ _lua_setFLAGS() {
CXX="$(tc-getCXX)"
LD="$(tc-getLD)"
- LUA_CF="$(${PKG_CONFIG} --cflags $(basename ${lua}))"
- LUA_LF="$(${PKG_CONFIG} --libs $(basename ${lua}))"
- LUA_LF="${LUA_LF//-llua /-l$(lua_get_lua) }"
+ LUA_CF="$(_lua_get_cf)"
+ LUA_LF="$(_lua_get_lf)"
CFLAGS="${GLOBAL_CFLAGS} ${LUA_CF} -fPIC -DPIC"
CXXFLAGS="${GLOBAL_CXXFLAGS} ${LUA_CF} -fPIC -DPIC"
@@ -968,7 +976,7 @@ _lua_default_each_configure() {
CXXFLAGS="${CXXFLAGS}"
PKG_CONFIG="${PKG_CONFIG}"
LUA_IMPL="$(lua_get_lua)"
- LUA_LINK_LIB="${LUA_LF}"
+ LUA_LINK_LIB="$(_lua_get_lf)"
)
ecl_confargs+=("${confargs[@]}")
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/lua:master commit in: eclass/
@ 2018-09-23 12:51 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 11+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2018-09-23 12:51 UTC (permalink / raw
To: gentoo-commits
commit: a0d4e9e8d4f68cb0f8ff11afc2f8165ba126c1f7
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sun Sep 23 06:40:40 2018 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sun Sep 23 06:40:40 2018 +0000
URL: https://gitweb.gentoo.org/proj/lua.git/commit/?id=a0d4e9e8
lua.eclass: prepare() mod
eclass/lua.eclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eclass/lua.eclass b/eclass/lua.eclass
index 01f74de..d64f5f4 100644
--- a/eclass/lua.eclass
+++ b/eclass/lua.eclass
@@ -917,7 +917,8 @@ _lua_default_all_prepare() {
"${@}"
)
- patches_src_prepare
+ [[ -z "${__PATCHES_PREPARE_CALLED}" ]] && patches_src_prepare
+ export __PATCHES_PREPARE_CALLED=1
[[ -x "${BOOTSTRAP}" ]] && ${BOOTSTRAP} "${prepargs[@]}"
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-09-23 12:51 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-10 9:56 [gentoo-commits] proj/lua:master commit in: eclass/ Vadim A. Misbakh-Soloviov
-- strict thread matches above, loose matches on Subject: below --
2018-09-23 12:51 Vadim A. Misbakh-Soloviov
2018-08-08 16:19 Vadim A. Misbakh-Soloviov
2017-11-02 19:47 Vadim A. Misbakh-Soloviov
2017-11-02 6:39 Vadim A. Misbakh-Soloviov
2017-11-01 12:18 Vadim A. Misbakh-Soloviov
2017-11-01 12:03 Vadim A. Misbakh-Soloviov
2017-04-06 3:54 Vadim A. Misbakh-Soloviov
2016-12-28 7:05 Vadim A. Misbakh-Soloviov
2016-05-27 22:13 Vadim A. Misbakh-Soloviov
2015-10-22 11:30 Vadim A. Misbakh-Soloviov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox