[arch-commits] Commit in lua (9 files)
Anatol Pomozov
anatolik at archlinux.org
Sun May 3 06:36:26 UTC 2015
Date: Sunday, May 3, 2015 @ 08:36:25
Author: anatolik
Revision: 238377
Update Lua to 5.3.0
Add lua52 package for packages that needs older lua
Added:
lua52/
lua52/trunk/
lua52/trunk/LICENSE
lua52/trunk/PKGBUILD
lua52/trunk/liblua.so.patch
lua52/trunk/lua.pc
Modified:
lua/trunk/PKGBUILD
lua/trunk/liblua.so.patch
lua51/trunk/PKGBUILD
--------------------------+
51/trunk/PKGBUILD | 8 ++---
52/trunk/LICENSE | 30 +++++++++++++++++++++
52/trunk/PKGBUILD | 63 +++++++++++++++++++++++++++++++++++++++++++++
52/trunk/liblua.so.patch | 57 ++++++++++++++++++++++++++++++++++++++++
52/trunk/lua.pc | 20 ++++++++++++++
trunk/PKGBUILD | 34 +++++++++++-------------
trunk/liblua.so.patch | 49 ++++++++++++++++++-----------------
7 files changed, 216 insertions(+), 45 deletions(-)
Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD 2015-05-03 05:31:30 UTC (rev 238376)
+++ trunk/PKGBUILD 2015-05-03 06:36:25 UTC (rev 238377)
@@ -4,50 +4,48 @@
# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
pkgname=lua
-pkgver=5.2.4
+pkgver=5.3.0
pkgrel=1
-pkgdesc='Powerful light-weight programming language designed for extending applications'
+pkgdesc='Powerful lightweight programming language designed for extending applications'
arch=('i686' 'x86_64')
url='http://www.lua.org/'
depends=('readline')
license=('MIT')
-options=('!makeflags' '!emptydirs')
-source=(http://www.lua.org/ftp/$pkgname-$pkgver.tar.gz
+options=('!emptydirs')
+source=(http://www.lua.org/ftp/lua-$pkgver.tar.gz
liblua.so.patch
lua.pc
LICENSE)
-md5sums=('913fdb32207046b273fdb17aad70be13'
- 'bdc663c7b82ffc0b5df67611621fb625'
+md5sums=('a1b0a7e92d0c85bbff7a8d27bf29f8af'
+ '85fe4e5f780376457eba3bc23d2cb2d3'
'e7ba6c2b695b0b84a5ea0cbff5fc9067'
'0e2bd67b909b9ff673da844ca3480df2')
prepare() {
- cd $pkgname-$pkgver
+ cd lua-$pkgver
patch -p1 -i ../liblua.so.patch
+
+ sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
}
build() {
- cd $pkgname-$pkgver
+ cd lua-$pkgver
- export CFLAGS="$CFLAGS -fPIC"
- make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
-
- sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
+ make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" linux
}
package() {
- cd $pkgname-$pkgver
+ cd lua-$pkgver
make \
- TO_LIB='liblua.a liblua.so liblua.so.5.2 liblua.so.5.2.4' \
+ TO_LIB="liblua.a liblua.so liblua.so.5.3 liblua.so.$pkgver" \
INSTALL_DATA='cp -d' \
INSTALL_TOP="$pkgdir"/usr \
INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
install
- install -Dm644 lua.pc "$pkgdir"/usr/lib/pkgconfig/lua.pc
+ install -Dm644 lua.pc "$pkgdir"/usr/lib/pkgconfig/$pkgname.pc
- # Install the documentation
- install -d "$pkgdir"/usr/share/doc/lua
- install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/lua
+ install -d "$pkgdir"/usr/share/doc/$pkgname
+ install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/$pkgname
install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
Modified: trunk/liblua.so.patch
===================================================================
--- trunk/liblua.so.patch 2015-05-03 05:31:30 UTC (rev 238376)
+++ trunk/liblua.so.patch 2015-05-03 06:36:25 UTC (rev 238377)
@@ -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 @@
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 /* }{ */
+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
- #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
-
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 @@
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 @@
$(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 \
Modified: 51/trunk/PKGBUILD
===================================================================
--- 51/trunk/PKGBUILD 2015-05-03 05:31:30 UTC (rev 238376)
+++ 51/trunk/PKGBUILD 2015-05-03 06:36:25 UTC (rev 238377)
@@ -23,6 +23,9 @@
cd lua-$pkgver
patch -p1 -i ../lua-arch.patch
patch -p1 -i ../lua-5.1-cflags.diff
+
+ sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc
+ sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' -i src/Makefile
}
build() {
@@ -29,9 +32,6 @@
cd lua-$pkgver
[[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC"
- sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc
- sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' \
- -i src/Makefile
make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
}
@@ -48,7 +48,7 @@
install
install -Dm644 etc/lua.pc "$pkgdir"/usr/lib/pkgconfig/lua5.1.pc
- install -d "$pkgdir/usr/share/doc/$pkgname"
+ install -d "$pkgdir"/usr/share/doc/$pkgname
install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/$pkgname
install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
Added: 52/trunk/LICENSE
===================================================================
--- 52/trunk/LICENSE (rev 0)
+++ 52/trunk/LICENSE 2015-05-03 06:36:25 UTC (rev 238377)
@@ -0,0 +1,30 @@
+License
+
+Lua is free software distributed under the terms of the MIT license
+reproduced below; it may be used for any purpose, including commercial
+purposes, at absolutely no cost without having to ask us. The only
+requirement is that if you do use Lua, then you should give us credit
+by including the appropriate copyright notice somewhere in your
+product or its documentation.
+
+ Copyright © 1994–2012 Lua.org, PUC-Rio.
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use, copy,
+ modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
Added: 52/trunk/PKGBUILD
===================================================================
--- 52/trunk/PKGBUILD (rev 0)
+++ 52/trunk/PKGBUILD 2015-05-03 06:36:25 UTC (rev 238377)
@@ -0,0 +1,63 @@
+# $Id: PKGBUILD 234446 2015-03-21 17:59:50Z bpiotrowski $
+# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
+
+pkgname=lua52
+pkgver=5.2.4
+pkgrel=1
+pkgdesc='Powerful lightweight programming language designed for extending applications'
+arch=('i686' 'x86_64')
+url='http://www.lua.org/'
+depends=('readline')
+license=('MIT')
+options=('!emptydirs')
+source=(http://www.lua.org/ftp/lua-$pkgver.tar.gz
+ liblua.so.patch
+ lua.pc
+ LICENSE)
+md5sums=('913fdb32207046b273fdb17aad70be13'
+ 'bdc663c7b82ffc0b5df67611621fb625'
+ 'e7ba6c2b695b0b84a5ea0cbff5fc9067'
+ '0e2bd67b909b9ff673da844ca3480df2')
+
+prepare() {
+ cd lua-$pkgver
+ patch -p1 -i ../liblua.so.patch
+
+ sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
+ sed -e 's:llua:llua5.2:' -e 's:/include:/include/lua5.2:' -i lua.pc
+ sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.2/' -e '/^LUAC_T=/ s/luac/luac5.2/' -i src/Makefile
+}
+
+build() {
+ cd lua-$pkgver
+
+ make MYCFLAGS="$CFLAGS -fPIC" MYLDFLAGS="$LDFLAGS" linux
+}
+
+package() {
+ cd lua-$pkgver
+
+ make \
+ TO_BIN='lua5.2 luac5.2' \
+ TO_LIB="liblua5.2.a liblua5.2.so liblua5.2.so.5.2 liblua5.2.so.$pkgver" \
+ INSTALL_DATA='cp -d' \
+ INSTALL_TOP="$pkgdir"/usr \
+ INSTALL_INC="$pkgdir"/usr/include/lua5.2 \
+ INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
+ install
+
+ install -Dm644 lua.pc "$pkgdir"/usr/lib/pkgconfig/$pkgname.pc
+
+ install -d "$pkgdir"/usr/share/doc/$pkgname
+ install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/$pkgname
+ install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
+ ln -s liblua5.2.so "$pkgdir"/usr/lib/liblua.so.5.2
+ ln -s liblua5.2.so "$pkgdir"/usr/lib/liblua.so.$pkgver
+
+ cd "$pkgdir"/usr/share/man/man1
+ mv lua.1 lua5.2.1
+ mv luac.1 luac5.2.1
+}
Added: 52/trunk/liblua.so.patch
===================================================================
--- 52/trunk/liblua.so.patch (rev 0)
+++ 52/trunk/liblua.so.patch 2015-05-03 06:36:25 UTC (rev 238377)
@@ -0,0 +1,57 @@
+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 @@
+ all: $(PLAT)
+
+ $(PLATS) clean:
+- cd src && $(MAKE) $@
++ cd src && $(MAKE) $@ V=$(V) R=$(R)
+
+ 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
+
+ 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 @@
+ 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_T) $(LUAC_T) $(LUA_SO)
+ ALL_A= $(LUA_A)
+
+ # Targets start here.
+@@ -59,6 +60,12 @@
+ $(AR) $@ $(BASE_O)
+ $(RANLIB) $@
+
++$(LUA_SO): $(CORE_O) $(LIB_O)
++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
++ ln -sf $(LUA_SO).$(R) $(LUA_SO)
++
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+
Added: 52/trunk/lua.pc
===================================================================
--- 52/trunk/lua.pc (rev 0)
+++ 52/trunk/lua.pc 2015-05-03 06:36:25 UTC (rev 238377)
@@ -0,0 +1,20 @@
+V=%VER%
+R=%REL%
+
+prefix=/usr
+INSTALL_BIN=${prefix}/bin
+INSTALL_INC=${prefix}/include
+INSTALL_LIB=${prefix}/lib
+INSTALL_MAN=${prefix}/man/man1
+INSTALL_LMOD=${prefix}/share/lua/${V}
+INSTALL_CMOD=${prefix}/lib/lua/${V}
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${R}
+Requires:
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir}
More information about the arch-commits
mailing list