vapier 14/03/28 05:38:36 Modified: ChangeLog Added: lua-5.1.5-r1.ebuild Log: Fix libdir setting in luaconf.h #493646 by Aleksey Kunitskiy. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.184 dev-lang/lua/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?rev=1.184&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?rev=1.184&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?r1=1.183&r2=1.184 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- ChangeLog 26 May 2013 16:55:34 -0000 1.183 +++ ChangeLog 28 Mar 2014 05:38:36 -0000 1.184 @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/lua -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.183 2013/05/26 16:55:34 mabi Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.184 2014/03/28 05:38:36 vapier Exp $ + +*lua-5.1.5-r1 (28 Mar 2014) + + 28 Mar 2014; Mike Frysinger <[email protected]> +lua-5.1.5-r1.ebuild: + Fix libdir setting in luaconf.h #493646 by Aleksey Kunitskiy. 26 May 2013; Matti Bickel <[email protected]> lua-5.2.1.ebuild: fix incorrect sed usage (bug #463416) 1.1 dev-lang/lua/lua-5.1.5-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.1.5-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.1.5-r1.ebuild?rev=1.1&content-type=text/plain Index: lua-5.1.5-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.1.5-r1.ebuild,v 1.1 2014/03/28 05:38:36 vapier Exp $ EAPI=4 inherit eutils multilib 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 )" DEPEND="${RDEPEND} sys-devel/libtool" PDEPEND="emacs? ( app-emacs/lua-mode )" 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 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 # 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 } # no need for a configure phase src_configure() { true; } 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 || die "emake failed" mv lua_test ../test/lua.static } src_install() { emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ V=${PV} gentoo_install \ || die "emake install gentoo_install failed" dodoc HISTORY README dohtml doc/*.html doc/*.png doc/*.css doc/*.gif doicon 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 }
