diff options
author | Matti Bickel <mabi@gentoo.org> | 2008-10-10 08:26:34 +0000 |
---|---|---|
committer | Matti Bickel <mabi@gentoo.org> | 2008-10-10 08:26:34 +0000 |
commit | 59d18dffb994e1279a576e69f17fce36310f1278 (patch) | |
tree | f5c56772db399ad856e8e357916cdb5736f81670 /dev-lang/lua | |
parent | Version bump. (diff) | |
download | gentoo-2-59d18dffb994e1279a576e69f17fce36310f1278.tar.gz gentoo-2-59d18dffb994e1279a576e69f17fce36310f1278.tar.bz2 gentoo-2-59d18dffb994e1279a576e69f17fce36310f1278.zip |
add cxx use flag
(Portage version: 2.2_rc11/cvs/Linux 2.6.23-gentoo-r3-20080120 ppc)
Diffstat (limited to 'dev-lang/lua')
-rw-r--r-- | dev-lang/lua/ChangeLog | 7 | ||||
-rw-r--r-- | dev-lang/lua/lua-5.1.4-r1.ebuild | 117 |
2 files changed, 123 insertions, 1 deletions
diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog index 27cbb3dafb2f..cd197886b0b7 100644 --- a/dev-lang/lua/ChangeLog +++ b/dev-lang/lua/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/lua # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.119 2008/10/01 15:31:38 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.120 2008/10/10 08:26:34 mabi Exp $ + +*lua-5.1.4-r1 (09 Oct 2008) + + 09 Oct 2008; Matti Bickel <mabi@gentoo.org> +lua-5.1.4-r1.ebuild: + add cxx use flag for compilation with g++ (fixes bug #234622) 01 Oct 2008; Matti Bickel <mabi@gentoo.org> +files/lua-5.1.4-deprecated.patch, +files/lua-5.1.4-test.patch: diff --git a/dev-lang/lua/lua-5.1.4-r1.ebuild b/dev-lang/lua/lua-5.1.4-r1.ebuild new file mode 100644 index 000000000000..ee544a3475fe --- /dev/null +++ b/dev-lang/lua/lua-5.1.4-r1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.4-r1.ebuild,v 1.1 2008/10/10 08:26:34 mabi Exp $ + +EAPI="1" + +inherit eutils portability versionator toolchain-funcs + +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 ~x86-fbsd" +IUSE="cxx +deprecated readline static" + +DEPEND="readline? ( sys-libs/readline )" + +src_unpack() { + local PATCH_PV=$(get_version_component_range 1-2) + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.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:4:1/' src/Makefile + + sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html + + if ! use deprecated ; then + epatch "${FILESDIR}"/${P}-deprecated.patch + epatch "${FILESDIR}"/${P}-test.patch + fi + + if ! use readline ; then + epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch + fi + + # Using dynamic linked lua is not recommended upstream 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 + # Not 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.patch + fi + + # We want packages to find our things... + sed -i -e 's:/usr/local:/usr:' etc/lua.pc +} + +src_compile() { + tc-export CC + if use cxx; then + CC=$(tc-getCXX) + fi + + myflags= + # what to link to liblua + liblibs="-lm" + mycflags="${mycflags} -DLUA_USE_LINUX" + liblibs="${liblibs} $(dlopen_lib)" + + # what to link to the executables + mylibs= + if use readline; then + mylibs="-lreadline" + fi + + cd src + emake CC="${CC}" CFLAGS="${mycflags} ${CFLAGS}" \ + RPATH="${ROOT}/usr/$(get_libdir)/" \ + LUA_LIBS="${mylibs}" \ + LIB_LIBS="${liblibs}" \ + V=${PV} \ + gentoo_all || die "emake failed" + + mv lua_test ../test/lua.static +} + +src_install() { + emake INSTALL_TOP="${D}/usr/" INSTALL_LIB="${D}/usr/$(get_libdir)/" \ + V=${PV} gentoo_install \ + || die "emake install gentoo_install failed" + + dodoc HISTORY README + dohtml doc/*.html doc/*.gif + + insinto /usr/share/pixmaps + doins etc/lua.ico + insinto /usr/$(get_libdir)/pkgconfig + doins etc/lua.pc + + doman doc/lua.1 doc/luac.1 +} + +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 "${S}" + 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 +} |