[csw-devel] SF.net SVN: gar:[16830] csw/mgar/pkg/lua/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Jan 19 21:56:09 CET 2012
Revision: 16830
http://gar.svn.sourceforge.net/gar/?rev=16830&view=rev
Author: dmichelsen
Date: 2012-01-19 20:56:09 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
lua/trunk: Update to 5.2.0, update patch, split package
Modified Paths:
--------------
csw/mgar/pkg/lua/trunk/Makefile
csw/mgar/pkg/lua/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch
Removed Paths:
-------------
csw/mgar/pkg/lua/trunk/files/dynamic.patch
Modified: csw/mgar/pkg/lua/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lua/trunk/Makefile 2012-01-19 16:40:38 UTC (rev 16829)
+++ csw/mgar/pkg/lua/trunk/Makefile 2012-01-19 20:56:09 UTC (rev 16830)
@@ -1,7 +1,12 @@
# $Id$
+# Open issues:
+# - no .pc file
+# - provide different C/C++ libs for liblua as discussed here:
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560139
+
NAME = lua
-VERSION = 5.1.4
+VERSION = 5.2.0
CATEGORIES = lang
DESCRIPTION = Light-weight language designed for extending applications
@@ -11,25 +16,48 @@
language.
endef
-SPKG_SOURCEURL = http://www.lua.org/
MASTER_SITES = http://www.lua.org/ftp/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
-PATCHFILES = dynamic.patch
+DISTFILES += $(DISTNAME).tar.gz
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PATCHFILES += 0001-Make-shared-lib.patch
+VENDOR_URL = http://www.lua.org
+
+LICENSE = doc/readme.html
+
+PACKAGES += CSWlua
+SPKG_DESC_CSWlua = Light-weight language designed for extending applications
+# PKGFILES is catchall
+
+PACKAGES += CSWliblua5-2
+SPKG_DESC_CSWliblua5-2 = Library for the LUA langauge, liblua.so.5.2
+PKGFILES_CSWliblua5-2 += $(call pkgfiles_lib,liblua.so.5.2)
+
+PACKAGES += CSWlua-dev
+SPKG_DESC_CSWlua-dev = Development files for liblua.so.5.2
+PKGFILES_CSWlua-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlua-dev += CSWliblua5-2
+
+REINPLACEMENTS += luaroot
+REINPLACE_MATCH_luaroot = (\#define\s+LUA_ROOT\s+).*
+REINPLACE_WITH_luaroot = $$1"$(prefix)"
+REINPLACE_FILES_luaroot += src/luaconf.h
+
+# No configure
CONFIGURE_SCRIPTS =
-BUILD_ARGS += solaris CC=$(CC)
-BUILD_ARGS += CFLAGS="${CFLAGS}
-BUILD_ARGS += -DLUA_USE_POSIX
-BUILD_ARGS += -DLUA_USE_DLOPEN
-BUILD_ARGS += -KPIC" MYLIBS="-ldl"
+EXTRA_CFLAGS += -KPIC
+BUILD_ARGS += solaris
+BUILD_ARGS += CC=$(CC)
+BUILD_ARGS += CFLAGS="$(CFLAGS)"
+BUILD_ARGS += MYLIBS="-ldl"
+BUILD_ARGS += LDFLAGS="$(LDFLAGS)"
+
+TEST_TARGET = test
+
INSTALL_ARGS += INSTALL=ginstall
INSTALL_ARGS += INSTALL_TOP=$(DESTDIR)$(prefix)
INSTALL_ARGS += INSTALL_MAN=$(DESTDIR)$(mandir)/man1
-LICENSE = COPYRIGHT
-
include gar/category.mk
Modified: csw/mgar/pkg/lua/trunk/checksums
===================================================================
--- csw/mgar/pkg/lua/trunk/checksums 2012-01-19 16:40:38 UTC (rev 16829)
+++ csw/mgar/pkg/lua/trunk/checksums 2012-01-19 20:56:09 UTC (rev 16830)
@@ -1,3 +1 @@
-31f0a21e4b8937af46d8e55a7b9cac51 download/CSWlua.gspec
-84b47da3b41da0bf44205291a4c81ea5 download/dynamic.patch
-d0870f2de55d59c1c8419f36e8fac150 download/lua-5.1.4.tar.gz
+f1ea831f397214bae8a265995ab1a93e lua-5.2.0.tar.gz
Added: csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch
===================================================================
--- csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch (rev 0)
+++ csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch 2012-01-19 20:56:09 UTC (rev 16830)
@@ -0,0 +1,95 @@
+From 65faf5dfa74ed9349a3b73156e271620ff227d12 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 19 Jan 2012 20:34:38 +0100
+Subject: [PATCH] Make shared lib
+
+---
+ Makefile | 9 ++++++++-
+ src/Makefile | 11 ++++++++++-
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ec53e1a..e553643 100644
+--- a/Makefile
++++ b/Makefile
+@@ -42,6 +42,9 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
+ TO_LIB= liblua.a
++TO_SOLIB= liblua.so
++TO_SOLIBR= liblua.so.$(R)
++TO_SOLIBV= liblua.so.$(V)
+ TO_MAN= lua.1 luac.1
+
+ # Lua version and release.
+@@ -52,7 +55,7 @@ R= $V.0
+ all: $(PLAT)
+
+ $(PLATS) clean:
+- cd src && $(MAKE) $@
++ cd src && $(MAKE) V=$(V) R=$(R) $@
+
+ test: dummy
+ src/lua -v
+@@ -62,6 +65,9 @@ install: dummy
+ cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
+ cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+ cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
++ cd src && $(INSTALL_EXEC) $(TO_SOLIBR) $(INSTALL_LIB)
++ cd src && ln -s $(TO_SOLIBR) $(INSTALL_LIB)/$(TO_SOLIB)
++ cd src && ln -s $(TO_SOLIBR) $(INSTALL_LIB)/$(TO_SOLIBV)
+ cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
+
+ uninstall:
+@@ -90,6 +96,7 @@ echo:
+ @echo "TO_BIN= $(TO_BIN)"
+ @echo "TO_INC= $(TO_INC)"
+ @echo "TO_LIB= $(TO_LIB)"
++ @echo "TO_SOLIB= $(TO_SOLIB)"
+ @echo "TO_MAN= $(TO_MAN)"
+ @echo "INSTALL_TOP= $(INSTALL_TOP)"
+ @echo "INSTALL_BIN= $(INSTALL_BIN)"
+diff --git a/src/Makefile b/src/Makefile
+index bba1693..fdd68b1 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -29,6 +29,7 @@ MYOBJS=
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+
+ LUA_A= liblua.a
++LUA_SO= liblua.so
+ CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+ lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
+ ltm.o lundump.o lvm.o lzio.o
+@@ -43,8 +44,9 @@ LUAC_T= luac
+ LUAC_O= luac.o
+
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
+ ALL_A= $(LUA_A)
++ALL_SO= $(LUA_SO)
+
+ # Targets start here.
+ default: $(PLAT)
+@@ -55,10 +57,17 @@ o: $(ALL_O)
+
+ a: $(ALL_A)
+
++so: $(ALL_SO)
++
+ $(LUA_A): $(BASE_O)
+ $(AR) $@ $?
+ $(RANLIB) $@
+
++$(LUA_SO): $(LUA_A)
++ -rm -f $(LUA_SO)
++ $(CC) -h $(LUA_SO).$(V) -G -o $(LUA_SO).$(R) $(CORE_O) $(LIB_O)
++ ln -s $(LUA_SO).$(R) $(LUA_SO)
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+
+--
+1.7.8.3
+
Deleted: csw/mgar/pkg/lua/trunk/files/dynamic.patch
===================================================================
--- csw/mgar/pkg/lua/trunk/files/dynamic.patch 2012-01-19 16:40:38 UTC (rev 16829)
+++ csw/mgar/pkg/lua/trunk/files/dynamic.patch 2012-01-19 20:56:09 UTC (rev 16830)
@@ -1,78 +0,0 @@
---- lua-5.1.3/src/Makefile.orig 2008-04-13 19:21:29.000000000 +0200
-+++ lua-5.1.3/src/Makefile 2008-04-13 20:06:30.000000000 +0200
-@@ -23,6 +23,7 @@
- PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
-
- LUA_A= liblua.a
-+LUA_SO= liblua.so
- CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
- lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \
- lundump.o lvm.o lzio.o
-@@ -33,8 +34,9 @@
- LUAC_O= luac.o print.o
-
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
- ALL_A= $(LUA_A)
-+ALL_SO= $(LUA_SO)
-
- default: $(PLAT)
-
-@@ -47,10 +49,17 @@
-
- a: $(ALL_A)
-
-+so: $(ALL_SO)
-+
- $(LUA_A): $(CORE_O) $(LIB_O)
- $(AR) $@ $?
- $(RANLIB) $@
-
-+$(LUA_SO): $(LUA_A)
-+ -rm -f $(LUA_SO)
-+ $(CC) -h $(LUA_SO).$(V) -G -o $(LUA_SO).$(R) $(CORE_O) $(LIB_O)
-+ ln -s $(LUA_SO).$(R) $(LUA_SO)
-+
- $(LUA_T): $(LUA_O) $(LUA_A)
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-
---- lua-5.1.3/Makefile.orig 2008-04-13 19:29:27.000000000 +0200
-+++ lua-5.1.3/Makefile 2008-04-13 19:52:12.000000000 +0200
-@@ -39,6 +39,9 @@
- TO_BIN= lua luac
- TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
- TO_LIB= liblua.a
-+TO_SOLIB= liblua.so
-+TO_SOLIBR= liblua.so.$(R)
-+TO_SOLIBV= liblua.so.$(V)
- TO_MAN= lua.1 luac.1
-
- # Lua version and release.
-@@ -48,7 +49,7 @@
- all: $(PLAT)
-
- $(PLATS) clean:
-- cd src && $(MAKE) $@
-+ cd src && $(MAKE) V=$(V) R=$(R) $@
-
- test: dummy
- src/lua test/hello.lua
-@@ -58,6 +59,9 @@
- cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
- cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
-+ cd src && $(INSTALL_EXEC) $(TO_SOLIBR) $(INSTALL_LIB)
-+ cd src && ln -s $(TO_SOLIBR) $(INSTALL_LIB)/$(TO_SOLIB)
-+ cd src && ln -s $(TO_SOLIBR) $(INSTALL_LIB)/$(TO_SOLIBV)
- cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
-
- local:
-@@ -103,6 +105,7 @@
- @echo "TO_BIN = $(TO_BIN)"
- @echo "TO_INC = $(TO_INC)"
- @echo "TO_LIB = $(TO_LIB)"
-+ @echo "TO_SOLIB = $(TO_SOLIB)"
- @echo "TO_MAN = $(TO_MAN)"
-
- # echo config parameters as Lua code
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list