lua: vesion bump to 5.3
This commit is contained in:
@@ -12,7 +12,7 @@ from pisi.actionsapi import get
|
||||
major = ".".join(get.srcVERSION().split(".")[:2])
|
||||
|
||||
def setup():
|
||||
pisitools.dosed("src/Makefile", "^CFLAGS.*$", "CFLAGS=%s -fPIC -DLUA_USE_LINUX" % get.CFLAGS())
|
||||
pisitools.dosed("src/Makefile", "^CFLAGS.*$", "CFLAGS=%s -fPIC -DLUA_USE_LINUX -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" % get.CFLAGS())
|
||||
pisitools.dosed("src/Makefile", "^MYLDFLAGS.*$", "MYLDFLAGS=%s" % get.LDFLAGS())
|
||||
pisitools.dosed("lua.pc", "%VER%", "%s" % major)
|
||||
pisitools.dosed("lua.pc", "%REL%", "%s" % get.srcVERSION())
|
||||
@@ -21,14 +21,14 @@ def build():
|
||||
autotools.make("linux")
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("INSTALL_TOP=%s/usr INSTALL_MAN=%s/usr/share/man/ TO_LIB='liblua.so liblua.so.5.2 liblua.so.5.2.4'" % (get.installDIR(),get.installDIR()))
|
||||
autotools.rawInstall("INSTALL_TOP=%s/usr INSTALL_MAN=%s/usr/share/man/ TO_LIB='liblua.so liblua.so.5.3 liblua.so.5.3.3'" % (get.installDIR(),get.installDIR()))
|
||||
|
||||
pisitools.insinto("/usr/lib/pkgconfig", "lua.pc")
|
||||
pisitools.insinto("/usr/lib/pkgconfig", "lua.pc", "lua5.2.pc")
|
||||
pisitools.insinto("/usr/lib/pkgconfig", "lua.pc", "lua5.3.pc")
|
||||
|
||||
#free directory
|
||||
pisitools.removeDir("usr/lib/lua/")
|
||||
pisitools.removeDir("usr/share/lua/")
|
||||
|
||||
pisitools.dohtml("doc")
|
||||
pisitools.dodoc("README")
|
||||
pisitools.dodoc("README")
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile
|
||||
--- lua-5.2.1/Makefile 2012-05-17 16:05:54.000000000 +0200
|
||||
+++ lua-5.2.1.new/Makefile 2012-09-12 22:39:07.162748096 +0200
|
||||
@@ -52,7 +52,7 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 7fa91c8..dccf485 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -52,7 +52,7 @@ R= $V.0
|
||||
all: $(PLAT)
|
||||
|
||||
$(PLATS) clean:
|
||||
@@ -10,30 +11,19 @@ diff -ru lua-5.2.1/Makefile lua-5.2.1.new/Makefile
|
||||
|
||||
test: dummy
|
||||
src/lua -v
|
||||
diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.new/src/luaconf.h
|
||||
--- lua-5.2.1/src/luaconf.h 2012-05-11 16:14:42.000000000 +0200
|
||||
+++ lua-5.2.1.new/src/luaconf.h 2012-09-12 22:40:27.986622772 +0200
|
||||
@@ -100,7 +100,7 @@
|
||||
#else /* }{ */
|
||||
|
||||
#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
|
||||
-#define LUA_ROOT "/usr/local/"
|
||||
+#define LUA_ROOT "/usr/"
|
||||
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
|
||||
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
|
||||
#define LUA_PATH_DEFAULT \
|
||||
diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile
|
||||
--- lua-5.2.1/src/Makefile 2012-03-09 17:32:16.000000000 +0100
|
||||
+++ lua-5.2.1.new/src/Makefile 2012-09-12 22:38:08.591386896 +0200
|
||||
@@ -29,6 +29,7 @@
|
||||
PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 2e7a412..fa5769f 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -29,6 +29,7 @@ MYOBJS=
|
||||
PLATS= aix bsd c89 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,7 +44,7 @@
|
||||
@@ -43,7 +44,7 @@ LUAC_T= luac
|
||||
LUAC_O= luac.o
|
||||
|
||||
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
|
||||
@@ -42,7 +32,7 @@ diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile
|
||||
ALL_A= $(LUA_A)
|
||||
|
||||
# Targets start here.
|
||||
@@ -59,6 +60,12 @@
|
||||
@@ -59,6 +60,12 @@ $(LUA_A): $(BASE_O)
|
||||
$(AR) $@ $(BASE_O)
|
||||
$(RANLIB) $@
|
||||
|
||||
@@ -55,3 +45,16 @@ diff -ru lua-5.2.1/src/Makefile lua-5.2.1.new/src/Makefile
|
||||
$(LUA_T): $(LUA_O) $(LUA_A)
|
||||
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
||||
|
||||
diff --git a/src/luaconf.h b/src/luaconf.h
|
||||
index fd28d21..e2662cc 100644
|
||||
--- a/src/luaconf.h
|
||||
+++ b/src/luaconf.h
|
||||
@@ -175,7 +175,7 @@
|
||||
|
||||
#else /* }{ */
|
||||
|
||||
-#define LUA_ROOT "/usr/local/"
|
||||
+#define LUA_ROOT "/usr/"
|
||||
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
|
||||
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
|
||||
#define LUA_PATH_DEFAULT \
|
||||
|
||||
@@ -12,9 +12,9 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>A light-weight programming language</Summary>
|
||||
<Description>lua is a powerful light-weight programming language designed for extending applications.</Description>
|
||||
<Archive sha1sum="ef15259421197e3d85b7d6e4871b8c26fd82c1cf" type="targz">http://www.lua.org/ftp/lua-5.2.4.tar.gz</Archive>
|
||||
<Archive sha1sum="a0341bc3d1415b814cc738b2ec01ae56045d64ef" type="targz">http://www.lua.org/ftp/lua-5.3.3.tar.gz</Archive>
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile target="lua.pc">lua.pc</AdditionalFile>
|
||||
<AdditionalFile target="lua.pc">lua.pc</AdditionalFile>
|
||||
</AdditionalFiles>
|
||||
<BuildDependencies>
|
||||
<Dependency>readline-devel</Dependency>
|
||||
@@ -54,6 +54,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2016-06-14</Date>
|
||||
<Version>5.3.3</Version>
|
||||
<Comment>Version Bump</Comment>
|
||||
<Name>Pisi Linux Community</Name>
|
||||
<Email>admin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-06-09</Date>
|
||||
<Version>5.2.4</Version>
|
||||
|
||||
Reference in New Issue
Block a user