public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-lang/lua: lua-5.2.0.ebuild ChangeLog
@ 2012-03-04 22:58 Matti Bickel (mabi)
  0 siblings, 0 replies; 3+ messages in thread
From: Matti Bickel (mabi) @ 2012-03-04 22:58 UTC (permalink / raw
  To: gentoo-commits

mabi        12/03/04 22:58:29

  Modified:             ChangeLog
  Added:                lua-5.2.0.ebuild
  Log:
  version bump (bug #395057). also now uses local libtool (bug #336167)
  
  (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

Revision  Changes    Path
1.154                dev-lang/lua/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?r1=1.153&r2=1.154

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog	24 Jan 2012 21:44:53 -0000	1.153
+++ ChangeLog	4 Mar 2012 22:58:29 -0000	1.154
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/lua
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.153 2012/01/24 21:44:53 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.154 2012/03/04 22:58:29 mabi Exp $
+
+*lua-5.2.0 (04 Mar 2012)
+
+  04 Mar 2012; Matti Bickel <mabi@gentoo.org> +files/configure.in,
+  +files/lua-5.2-make.patch, +files/lua.pc, +lua-5.2.0.ebuild:
+  version bump (bug #395057). also now uses local libtool (bug #336167)
 
 *lua-5.1.4-r8 (24 Jan 2012)
 



1.1                  dev-lang/lua/lua-5.2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild?rev=1.1&content-type=text/plain

Index: lua-5.2.0.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild,v 1.1 2012/03/04 22:58:29 mabi Exp $

EAPI=4

inherit eutils autotools 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 ~x86-fbsd"
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.patch

	sed -i \
		-e 's:\(LUA_ROOT\s*\).*:\1"/usr/":' \
		-e "s:\(LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
		src/luaconf.h \
	|| die "failed patching luaconf.h"

	# correct lua versioning
	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\17:0:2/' src/Makefile

	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html

	if ! use readline ; then
		sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h
	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
	fi

	# upstream does not use libtool, but we do (see bug #336167)
	cp "${FILESDIR}/configure.in" "${S}"
	eautoreconf
}

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

	local legacy=""
	use deprecated && legacy="-DLUA_COMPAT_ALL"

	emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${legacy} ${CFLAGS}" \
			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
			LUA_LIBS="${mylibs}" \
			LIB_LIBS="${liblibs}" \
			V=${PV} \
			gentoo_all || die "emake failed"
}

src_install() {
	local PATCH_PV=$(get_version_component_range 1-2)

	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
			V=${PV} gentoo_install \
	|| die "emake install gentoo_install failed"

	dodoc README
	dohtml doc/*.html doc/*.png doc/*.css doc/*.gif

	doman doc/lua.1 doc/luac.1

	# 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"
	doins "${WORKDIR}/lua.pc"
}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-lang/lua: lua-5.2.0.ebuild ChangeLog
@ 2012-03-05 22:01 Matti Bickel (mabi)
  0 siblings, 0 replies; 3+ messages in thread
From: Matti Bickel (mabi) @ 2012-03-05 22:01 UTC (permalink / raw
  To: gentoo-commits

mabi        12/03/05 22:01:15

  Modified:             lua-5.2.0.ebuild ChangeLog
  Log:
  make lua respect LDFLAGS (bug #406997)
  
  (Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-lang/lua/lua-5.2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild?r1=1.1&r2=1.2

Index: lua-5.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lua-5.2.0.ebuild	4 Mar 2012 22:58:29 -0000	1.1
+++ lua-5.2.0.ebuild	5 Mar 2012 22:01:15 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild,v 1.1 2012/03/04 22:58:29 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild,v 1.2 2012/03/05 22:01:15 mabi Exp $
 
 EAPI=4
 
@@ -57,16 +57,14 @@
 
 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
+	use readline && mylibs="-lreadline"
 
 	cd src
 
@@ -74,6 +72,7 @@
 	use deprecated && legacy="-DLUA_COMPAT_ALL"
 
 	emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${legacy} ${CFLAGS}" \
+			SYSLDFLAGS="${LDFLAGS}"
 			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
 			LUA_LIBS="${mylibs}" \
 			LIB_LIBS="${liblibs}" \



1.156                dev-lang/lua/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?r1=1.155&r2=1.156

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog	5 Mar 2012 12:42:58 -0000	1.155
+++ ChangeLog	5 Mar 2012 22:01:15 -0000	1.156
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/lua
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.155 2012/03/05 12:42:58 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.156 2012/03/05 22:01:15 mabi Exp $
+
+  05 Mar 2012; Matti Bickel <mabi@gentoo.org> lua-5.2.0.ebuild:
+  make lua respect LDFLAGS (bug #406997)
 
   05 Mar 2012; Matti Bickel <mabi@gentoo.org>
   -files/5.1.3/01_all_LUAI_MAXCSTACK.upstream.patch,






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-lang/lua: lua-5.2.0.ebuild ChangeLog
@ 2012-03-05 23:25 Zac Medico (zmedico)
  0 siblings, 0 replies; 3+ messages in thread
From: Zac Medico (zmedico) @ 2012-03-05 23:25 UTC (permalink / raw
  To: gentoo-commits

zmedico     12/03/05 23:25:29

  Modified:             lua-5.2.0.ebuild ChangeLog
  Log:
  Add missing newline escape in src_compile emake command.
  
  (Portage version: 2.2.0_alpha90/cvs/Linux i686)

Revision  Changes    Path
1.3                  dev-lang/lua/lua-5.2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild?r1=1.2&r2=1.3

Index: lua-5.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lua-5.2.0.ebuild	5 Mar 2012 22:01:15 -0000	1.2
+++ lua-5.2.0.ebuild	5 Mar 2012 23:25:29 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild,v 1.2 2012/03/05 22:01:15 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild,v 1.3 2012/03/05 23:25:29 zmedico Exp $
 
 EAPI=4
 
@@ -72,7 +72,7 @@
 	use deprecated && legacy="-DLUA_COMPAT_ALL"
 
 	emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${legacy} ${CFLAGS}" \
-			SYSLDFLAGS="${LDFLAGS}"
+			SYSLDFLAGS="${LDFLAGS}" \
 			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
 			LUA_LIBS="${mylibs}" \
 			LIB_LIBS="${liblibs}" \



1.157                dev-lang/lua/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?rev=1.157&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?rev=1.157&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/ChangeLog?r1=1.156&r2=1.157

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- ChangeLog	5 Mar 2012 22:01:15 -0000	1.156
+++ ChangeLog	5 Mar 2012 23:25:29 -0000	1.157
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/lua
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.156 2012/03/05 22:01:15 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.157 2012/03/05 23:25:29 zmedico Exp $
+
+  05 Mar 2012; Zac Medico <zmedico@gentoo.org> lua-5.2.0.ebuild:
+  Add missing newline escape in src_compile emake command.
 
   05 Mar 2012; Matti Bickel <mabi@gentoo.org> lua-5.2.0.ebuild:
   make lua respect LDFLAGS (bug #406997)






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-03-05 23:25 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-05 22:01 [gentoo-commits] gentoo-x86 commit in dev-lang/lua: lua-5.2.0.ebuild ChangeLog Matti Bickel (mabi)
  -- strict thread matches above, loose matches on Subject: below --
2012-03-05 23:25 Zac Medico (zmedico)
2012-03-04 22:58 Matti Bickel (mabi)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox