diff options
Diffstat (limited to 'dev-lua/lua-openssl')
| -rw-r--r-- | dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild (renamed from dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild) | 11 | ||||
| -rw-r--r-- | dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild (renamed from dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild) | 9 |
2 files changed, 19 insertions, 1 deletions
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild index f8e40f03140f..0162c1cdc347 100644 --- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild +++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild @@ -4,7 +4,7 @@ EAPI=7 EGIT_COMMIT_AUX="8d09895473b73e4fb72b7573615f69c36e1860a2" -LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) MY_PN_AUX="lua-auxiliar" MY_PN_COMPAT="lua-compat-5.3" MY_PV="${PV//_p/-}" @@ -46,6 +46,9 @@ DOCS=( "README.md" "samples/." ) src_prepare() { default + # Allow override of LUA* variables + sed -e '/LUA /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die + # Prepare needed dependencies (source code files only) rm -r deps/{auxiliar,lua-compat} || die mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die @@ -60,6 +63,7 @@ lua_src_compile() { local myemakeargs=( "AR=$(tc-getAR)" "CC=$(tc-getCC)" + "LUA=" "LUA_CFLAGS=${CFLAGS} $(lua_get_CFLAGS)" "LUA_LIBS=${LDFLAGS}" "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" @@ -80,6 +84,8 @@ lua_src_test() { local myemakeargs=( "LUA=${ELUA}" + "LUA_CFLAGS=" + "LUA_LIBS=" "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" "TARGET_SYS=${CTARGET:-${CHOST}}" ) @@ -97,7 +103,10 @@ lua_src_install() { pushd "${BUILD_DIR}" || die local myemakeargs=( + "LUA=" + "LUA_CFLAGS=" "LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)" + "LUA_LIBS=" "LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))" "TARGET_SYS=${CTARGET:-${CHOST}}" ) diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild index c8c126b8cb44..88652952c1f3 100644 --- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild +++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild @@ -45,6 +45,9 @@ DOCS=( "README.md" "samples/." ) src_prepare() { default + # Allow override of LUA* variables + sed -e '/LUA /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die + # Prepare needed dependencies (source code files only) rm -r deps/{auxiliar,lua-compat} || die mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die @@ -55,6 +58,7 @@ src_compile() { local myemakeargs=( "AR=$(tc-getAR)" "CC=$(tc-getCC)" + "LUA=" "LUA_CFLAGS=${CFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))" "LUA_LIBS=${LDFLAGS}" "LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))" @@ -67,6 +71,8 @@ src_compile() { src_test() { local myemakeargs=( "LUA=$(usex luajit 'luajit' 'lua')" + "LUA_CFLAGS=" + "LUA_LIBS=" "LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))" "TARGET_SYS=${CTARGET:-${CHOST}}" ) @@ -76,7 +82,10 @@ src_test() { src_install() { local myemakeargs=( + "LUA=" + "LUA_CFLAGS=" "LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))" + "LUA_LIBS=" "LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))" "TARGET_SYS=${CTARGET:-${CHOST}}" ) |