diff options
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/lua/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/lua/files/lua-5.1-make.patch | 10 | ||||
| -rw-r--r-- | dev-lang/lua/lua-5.1.4.ebuild | 7 |
3 files changed, 14 insertions, 11 deletions
diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog index c042321f3f68..3d58318f9adf 100644 --- a/dev-lang/lua/ChangeLog +++ b/dev-lang/lua/ChangeLog @@ -1,6 +1,10 @@ # 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.121 2008/10/17 19:20:34 mabi Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.122 2009/03/21 12:42:02 mabi Exp $ + + 21 Mar 2009; Matti Bickel <mabi@gentoo.org> files/lua-5.1-make.patch, + lua-5.1.4.ebuild: + fixed bug #253594, removed useless variable 17 Oct 2008; Matti Bickel <mabi@gentoo.org> -lua-5.1.4-r1.ebuild: rolled back the -r1 ebuild b/c it breaks several packages (see bug #242174 diff --git a/dev-lang/lua/files/lua-5.1-make.patch b/dev-lang/lua/files/lua-5.1-make.patch index d051a21cb632..0c88bffedb22 100644 --- a/dev-lang/lua/files/lua-5.1-make.patch +++ b/dev-lang/lua/files/lua-5.1-make.patch @@ -44,19 +44,19 @@ + +$(LIB_NAME): $(LIB_OBJS) + $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \ -+ -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) ++ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) + +$(LIB_NAME:.la=.a): $(LIB_OBJS) -+ $(LIBTOOL) --mode=link $(CC) -static -o $(LIB_NAME:.la=.a) $(LIB_OBJS) ++ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $(LIB_NAME:.la=.a) $(LIB_OBJS) + +$(LUA_T): $(LUA_O) $(LIB_NAME) -+ $(LIBTOOL) --mode=link $(CC) -Wl,-E -o $@ $(LUA_O) $(LUA_LIBS) -llua ++ $(LIBTOOL) --mode=link $(CC) -Wl,-E $(LDFLAGS) -o $@ $(LUA_O) $(LUA_LIBS) -llua + +lua_test: $(LUA_O) $(LIB_NAME) -+ $(LIBTOOL) --mode=link $(CC) -static -Wl,-E -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS) ++ $(LIBTOOL) --mode=link $(CC) -static -Wl,-E $(LDFLAGS) -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS) + +$(LUAC_T): $(LUAC_O) $(LIB_NAME) -+ $(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O) $(LIB_NAME) ++ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O) $(LIB_NAME) + +gentoo_clean: + $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac diff --git a/dev-lang/lua/lua-5.1.4.ebuild b/dev-lang/lua/lua-5.1.4.ebuild index b75d588af811..f844bf749426 100644 --- a/dev-lang/lua/lua-5.1.4.ebuild +++ b/dev-lang/lua/lua-5.1.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 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.ebuild,v 1.1 2008/09/28 10:00:26 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.4.ebuild,v 1.2 2009/03/21 12:42:02 mabi Exp $ EAPI="1" @@ -60,7 +60,6 @@ src_compile() { myflags= # what to link to liblua liblibs="-lm" - mycflags="${mycflags} -DLUA_USE_LINUX" liblibs="${liblibs} $(dlopen_lib)" # what to link to the executables @@ -70,7 +69,7 @@ src_compile() { fi cd src - emake CC="${CC}" CFLAGS="${mycflags} ${CFLAGS}" \ + emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \ RPATH="${ROOT}/usr/$(get_libdir)/" \ LUA_LIBS="${mylibs}" \ LIB_LIBS="${liblibs}" \ |