mgorny 14/06/12 21:46:47
Modified: ChangeLog
Added: lua-5.1.5-r3.ebuild lua-5.2.3-r1.ebuild
lua-5.1.5-r100.ebuild
Log:
Enable multilib support.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.188 dev-lang/lua/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?rev=1.188&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?rev=1.188&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?r1=1.187&r2=1.188
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- ChangeLog 29 May 2014 21:58:33 -0000 1.187
+++ ChangeLog 12 Jun 2014 21:46:47 -0000 1.188
@@ -1,6 +1,14 @@
# ChangeLog for dev-lang/lua
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.187 2014/05/29
21:58:33 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.188 2014/06/12
21:46:47 mgorny Exp $
+
+*lua-5.1.5-r100 (12 Jun 2014)
+*lua-5.1.5-r3 (12 Jun 2014)
+*lua-5.2.3-r1 (12 Jun 2014)
+
+ 12 Jun 2014; Michał Górny <[email protected]> +lua-5.1.5-r100.ebuild,
+ +lua-5.1.5-r3.ebuild, +lua-5.2.3-r1.ebuild:
+ Enable multilib support.
29 May 2014; Matti Bickel <[email protected]> -lua-5.1.4-r4.ebuild:
remove stale EAPI1 ebuild
1.1 dev-lang/lua/lua-5.1.5-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.1.5-r3.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.1.5-r3.ebuild?rev=1.1&content-type=text/plain
Index: lua-5.1.5-r3.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.5-r3.ebuild,v 1.1
2014/06/12 21:46:47 mgorny Exp $
EAPI=5
inherit eutils multilib multilib-minimal portability toolchain-funcs versionator
DESCRIPTION="A powerful light-weight programming language designed for
extending applications"
HOMEPAGE="http://www.lua.org/";
SRC_URI="http://www.lua.org/ftp/${P}.tar.gz";
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( sys-libs/readline[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
sys-devel/libtool"
PDEPEND="emacs? ( app-emacs/lua-mode )"
MULTILIB_WRAPPED_HEADERS=(
/usr/include/luaconf.h
)
src_prepare() {
local PATCH_PV=$(get_version_component_range 1-2)
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
#EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
# correct lua versioning
sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile || die
sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
if ! use deprecated ; then
# patches from 5.1.4 still apply
epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
fi
if ! use readline ; then
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
fi
# Using dynamic linked lua is not recommended for performance
# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
# Mainly, this is of concern if your arch is poor with GPRs, like x86
# Note that this only affects the interpreter binary (named lua), not
the lua
# compiler (built statically) nor the lua libraries (both shared and
static
# are installed)
if use static ; then
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
fi
# custom Makefiles
multilib_copy_sources
}
multilib_src_configure() {
# We want packages to find our things...
sed -i \
-e 's:/usr/local:'${EPREFIX}'/usr:' \
-e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
etc/lua.pc src/luaconf.h || die
}
multilib_src_compile() {
tc-export CC
myflags=
# what to link to liblua
liblibs="-lm"
liblibs="${liblibs} $(dlopen_lib)"
# what to link to the executables
mylibs=
if use readline; then
mylibs="-lreadline"
fi
cd src
emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
RPATH="${EPREFIX}/usr/$(get_libdir)/" \
LUA_LIBS="${mylibs}" \
LIB_LIBS="${liblibs}" \
V=${PV} \
gentoo_all
mv lua_test ../test/lua.static
}
multilib_src_install() {
emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
V=${PV} gentoo_install
insinto /usr/$(get_libdir)/pkgconfig
doins etc/lua.pc
}
multilib_src_install_all() {
dodoc HISTORY README
dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
doicon etc/lua.ico
doman doc/lua.1 doc/luac.1
}
multilib_src_test() {
local positive="bisect cf echo env factorial fib fibfor hello printf
sieve
sort trace-calls trace-globals"
local negative="readonly"
local test
cd "${BUILD_DIR}" || die
for test in ${positive}; do
test/lua.static test/${test}.lua || die "test $test failed"
done
for test in ${negative}; do
test/lua.static test/${test}.lua && die "test $test failed"
done
}
1.1 dev-lang/lua/lua-5.2.3-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.2.3-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.2.3-r1.ebuild?rev=1.1&content-type=text/plain
Index: lua-5.2.3-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.3-r1.ebuild,v 1.1
2014/06/12 21:46:47 mgorny Exp $
EAPI=5
inherit eutils autotools multilib multilib-minimal portability toolchain-funcs
versionator
DESCRIPTION="A powerful light-weight programming language designed for
extending applications"
HOMEPAGE="http://www.lua.org/";
SRC_URI="http://www.lua.org/ftp/${P}.tar.gz";
LICENSE="MIT"
SLOT="5.2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( sys-libs/readline )
app-admin/eselect-lua
!dev-lang/lua:0"
DEPEND="${RDEPEND}
sys-devel/libtool"
PDEPEND="emacs? ( app-emacs/lua-mode )"
MULTILIB_WRAPPED_HEADERS=(
/usr/include/lua${SLOT}/luaconf.h
)
src_prepare() {
local PATCH_PV=$(get_version_component_range 1-2)
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
[ -d "${FILESDIR}/${PV}" ] && \
EPATCH_SOURCE="${FILESDIR}/${PV}"
EPATCH_SUFFIX="upstream.patch" epatch
# correct lua versioning
sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
if ! use readline ; then
sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die
fi
# Using dynamic linked lua is not recommended for performance
# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
# Mainly, this is of concern if your arch is poor with GPRs, like x86
# Note that this only affects the interpreter binary (named lua), not
the lua
# compiler (built statically) nor the lua libraries (both shared and
static
# are installed)
if use static ; then
sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile ||
die
fi
# upstream does not use libtool, but we do (see bug #336167)
cp "${FILESDIR}/configure.in" "${S}"/ || die
eautoreconf
# custom Makefiles
multilib_copy_sources
}
multilib_src_configure() {
sed -i \
-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
src/luaconf.h \
|| die "failed patching luaconf.h"
econf
}
multilib_src_compile() {
tc-export CC
# what to link to liblua
liblibs="-lm"
liblibs="${liblibs} $(dlopen_lib)"
# what to link to the executables
mylibs=
use readline && mylibs="-lreadline"
cd src
local myCFLAGS=""
use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
case "${CHOST}" in
*-mingw*) : ;;
*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
esac
emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
SYSLDFLAGS="${LDFLAGS}" \
RPATH="${EPREFIX}/usr/$(get_libdir)/" \
LUA_LIBS="${mylibs}" \
LIB_LIBS="${liblibs}" \
V=$(get_version_component_range 1-2) \
gentoo_all
}
multilib_src_install() {
emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
V=${SLOT} gentoo_install
# We want packages to find our things...
cp "${FILESDIR}/lua.pc" "${WORKDIR}"
sed -i \
-e "s:^V=.*:V= ${PATCH_PV}:" \
-e "s:^R=.*:R= ${PV}:" \
-e "s:/,lib,:/$(get_libdir):g" \
"${WORKDIR}/lua.pc"
insinto "/usr/$(get_libdir)/pkgconfig"
newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
}
multilib_src_install_all() {
dodoc README
dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
newman doc/lua.1 lua${SLOT}.1
newman doc/luac.1 luac${SLOT}.1
}
# Makefile contains a dummy target that doesn't do tests
# but causes issues with slotted lua (bug #510360)
src_test() { :; }
1.1 dev-lang/lua/lua-5.1.5-r100.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.1.5-r100.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.1.5-r100.ebuild?rev=1.1&content-type=text/plain
Index: lua-5.1.5-r100.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.5-r100.ebuild,v 1.1
2014/06/12 21:46:47 mgorny Exp $
EAPI=5
inherit eutils multilib multilib-minimal portability toolchain-funcs versionator
DESCRIPTION="A powerful light-weight programming language designed for
extending applications"
HOMEPAGE="http://www.lua.org/";
SRC_URI="http://www.lua.org/ftp/${P}.tar.gz";
LICENSE="MIT"
SLOT="5.1"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="+deprecated emacs readline static"
RDEPEND="readline? ( sys-libs/readline[${MULTILIB_USEDEP}] )
app-admin/eselect-lua
!dev-lang/lua:0"
DEPEND="${RDEPEND}
sys-devel/libtool"
PDEPEND="emacs? ( app-emacs/lua-mode )"
SAN_SLOT="${SLOT//.}"
MULTILIB_WRAPPED_HEADERS=(
/usr/include/lua${SLOT}/luaconf.h
)
src_prepare() {
local PATCH_PV=$(get_version_component_range 1-2)
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch
#EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
# correct lua versioning
sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile
sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
if ! use deprecated ; then
# patches from 5.1.4 still apply
epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
fi
if ! use readline ; then
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch
fi
# Using dynamic linked lua is not recommended for performance
# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
# Mainly, this is of concern if your arch is poor with GPRs, like x86
# Note that this only affects the interpreter binary (named lua), not
the lua
# compiler (built statically) nor the lua libraries (both shared and
static
# are installed)
if use static ; then
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch
fi
# custom Makefiles
multilib_copy_sources
}
multilib_src_configure() {
# We want packages to find our things...
sed -i \
-e 's:/usr/local:'${EPREFIX}'/usr:' \
-e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \
etc/lua.pc src/luaconf.h || die
}
multilib_src_compile() {
tc-export CC
myflags=
# what to link to liblua
liblibs="-lm"
liblibs="${liblibs} $(dlopen_lib)"
# what to link to the executables
mylibs=
if use readline; then
mylibs="-lreadline"
fi
cd src
emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \
RPATH="${EPREFIX}/usr/$(get_libdir)/" \
LUA_LIBS="${mylibs}" \
LIB_LIBS="${liblibs}" \
V=$(get_version_component_range 1-2) \
gentoo_all
mv lua_test ../test/lua.static
}
multilib_src_install() {
emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
V=${SLOT} gentoo_install
insinto /usr/$(get_libdir)/pkgconfig
newins etc/lua.pc lua${SLOT}.pc
}
multilib_src_install_all() {
dodoc HISTORY README
dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
doicon etc/lua.ico
newman doc/lua.1 lua${SLOT}.1
newman doc/luac.1 luac${SLOT}.1
}
multilib_src_test() {
local positive="bisect cf echo env factorial fib fibfor hello printf
sieve
sort trace-calls trace-globals"
local negative="readonly"
local test
cd "${BUILD_DIR}" || die
for test in ${positive}; do
test/lua.static test/${test}.lua || die "test $test failed"
done
for test in ${negative}; do
test/lua.static test/${test}.lua && die "test $test failed"
done
}
