This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 93c77304611ec32f68b44d7be2b327f6b919d14e (commit) via 135f5412640ea354dd0f726dcfb24957be3bfcbb (commit) via 05667f338fa5f9fd4513f5fa082812db88372962 (commit) from 54b1184284b869b3679e245d04ffc300f1a9ec3a (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 93c77304611ec32f68b44d7be2b327f6b919d14e Merge: 54b1184 135f541 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jun 11 23:26:34 2011 +0200

Merge remote-tracking branch 'stevee/lua'

commit 135f5412640ea354dd0f726dcfb24957be3bfcbb Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jun 11 22:24:32 2011 +0200

lua: Move liblua-5.1.so to libs package.

Fixes #192

commit 05667f338fa5f9fd4513f5fa082812db88372962 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jun 11 22:16:43 2011 +0200

lua: Clean up NM file.

-----------------------------------------------------------------------

Summary of changes: pkgs/lua/lua.nm | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)

Difference in files: diff --git a/pkgs/lua/lua.nm b/pkgs/lua/lua.nm index 4f5475d..4ecdd32 100644 --- a/pkgs/lua/lua.nm +++ b/pkgs/lua/lua.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = lua PKG_VER = 5.1.4 -PKG_REL = 0 +PKG_REL = 2

PKG_MAINTAINER = PKG_GROUPS = Development/Languages @@ -51,24 +51,24 @@ PKG_TARBALL = $(THISAPP).tar.gz

PKG_PACKAGES += $(PKG_NAME)-devel $(PKG_NAME)-libs

+PKG_FILES-$(PKG_NAME)-libs = \ + /usr/lib/liblua-5.1.so + define STAGE_PREPARE_CMDS cd $(DIR_APP) && chmod u+x autogen.sh config.guess config.sub configure \ depcomp install-sh missing cd $(DIR_APP) && sh autogen.sh endef

-define STAGE_BUILD - cd $(DIR_APP) && \ - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --with-readline +CONFIGURE_OPTIONS += \ + --mandir=/usr/share/man \ + --with-readline

- $(DO_FIX_LIBTOOL) +# hack so that only /usr/bin/lua gets linked with readline as it is the +# only one which needs this and otherwise we get License troubles +STAGE_BUILD_TARGETS = LIBS="-ldl" luac_LDADD="liblua.la -lm -ldl"

- # hack so that only /usr/bin/lua gets linked with readline as it is the - # only one which needs this and otherwise we get License troubles - cd $(DIR_APP) && make $(PARALLELISMFLAGS) LIBS="-ldl" luac_LDADD="liblua.la -lm -ldl" - # also remove readline from lua.pc +# Remove readline from lua.pc +define STAGE_BUILD_CMDS cd $(DIR_APP) && sed -i 's/-lreadline -lncurses //g' etc/lua.pc endef

hooks/post-receive -- IPFire 3.x development tree